diff options
| author | Alexander Duyck <aduyck@mirantis.com> | 2016-03-22 16:18:07 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-23 14:19:08 -0400 |
| commit | 5197f3499c470ccc4b247db66ff883e597e3adda (patch) | |
| tree | 3e468a804a1b2fcd9c3478534347ed442be93973 | |
| parent | 621e49f6d80a731dd3073569571c4579352cfb1c (diff) | |
| download | op-kernel-dev-5197f3499c470ccc4b247db66ff883e597e3adda.zip op-kernel-dev-5197f3499c470ccc4b247db66ff883e597e3adda.tar.gz | |
net: Reset encap_level to avoid resetting features on inner IP headers
This patch corrects an oversight in which we were allowing the encap_level
value to pass from the outer headers to the inner headers. As a result we
were incorrectly identifying UDP or GRE tunnels as also making use of ipip
or sit when the second header actually represented a tunnel encapsulated in
either a UDP or GRE tunnel which already had the features masked.
Fixes: 76443456227097179c1482 ("net: Move GSO csum into SKB_GSO_CB")
Reported-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Acked-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/gre_offload.c | 1 | ||||
| -rw-r--r-- | net/ipv4/udp_offload.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c index dd03161..c47539d 100644 --- a/net/ipv4/gre_offload.c +++ b/net/ipv4/gre_offload.c @@ -49,6 +49,7 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb, /* setup inner skb. */ skb->encapsulation = 0; + SKB_GSO_CB(skb)->encap_level = 0; __skb_pull(skb, tnl_hlen); skb_reset_mac_header(skb); skb_set_network_header(skb, skb_inner_network_offset(skb)); diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c index 8007f73..0ed2daf 100644 --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c @@ -56,6 +56,7 @@ static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb, /* setup inner skb. */ skb->encapsulation = 0; + SKB_GSO_CB(skb)->encap_level = 0; __skb_pull(skb, tnl_hlen); skb_reset_mac_header(skb); skb_set_network_header(skb, skb_inner_network_offset(skb)); |
