net: Reset encap_level to avoid resetting features on inner IP headers
authorAlexander Duyck <aduyck@mirantis.com>
Tue, 22 Mar 2016 23:18:07 +0000 (16:18 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 23 Mar 2016 18:19:08 +0000 (14:19 -0400)
commit5197f3499c470ccc4b247db66ff883e597e3adda
tree3e468a804a1b2fcd9c3478534347ed442be93973
parent621e49f6d80a731dd3073569571c4579352cfb1c
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>
net/ipv4/gre_offload.c
net/ipv4/udp_offload.c