diff options
| author |   Eli Cooper <elicooper@gmx.com> | 2016-11-01 23:45:13 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-11-02 15:18:36 -0400 |
| commit | 4fd19c15decedd06d707e2691c24fce08700e2b1 (patch) | |
| tree | e05209ac39cc936f396b7f7e7df37fa95518ea6a | |
| parent | ip6_tunnel: Clear IP6CB in ip6tunnel_xmit() (diff) | |
| download | linux-dev-4fd19c15decedd06d707e2691c24fce08700e2b1.tar.xz linux-dev-4fd19c15decedd06d707e2691c24fce08700e2b1.zip | |
ip6_udp_tunnel: remove unused IPCB related codes
Some IPCB fields are currently set in udp_tunnel6_xmit_skb(), which are
never used before it reaches ip6tunnel_xmit(), and past that point the
control buffer is no longer interpreted as IPCB.
This clears these unused IPCB related codes. Currently there is no skb
scrubbing in ip6_udp_tunnel, otherwise IPCB(skb)->opt might need to be
cleared for IPv4 packets, as shown in 5146d1f1511
("tunnel: Clear IPCB(skb)->opt before dst_link_failure called").
Signed-off-by: Eli Cooper <elicooper@gmx.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/ip6_udp_tunnel.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv6/ip6_udp_tunnel.c b/net/ipv6/ip6_udp_tunnel.c index a7520528ecd2..b283f293ee4a 100644 --- a/net/ipv6/ip6_udp_tunnel.c +++ b/net/ipv6/ip6_udp_tunnel.c @@ -88,9 +88,6 @@ int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sock *sk, uh->len = htons(skb->len); - memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); - IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED - | IPSKB_REROUTED); skb_dst_set(skb, dst); udp6_set_csum(nocheck, skb, saddr, daddr, skb->len); |