]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
gro: Allow tunnel stacking in the case of FOU/GUE
authorAlexander Duyck <aduyck@mirantis.com>
Tue, 29 Mar 2016 21:55:22 +0000 (14:55 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 30 Mar 2016 20:02:33 +0000 (16:02 -0400)
commitc3483384ee511ee2af40b4076366cd82a6a47b86
treed03ccb822ef22c6140edf83e244fc9ae69942e27
parentfea24857bb62990b839feb62090ad72a1c93735a
gro: Allow tunnel stacking in the case of FOU/GUE

This patch should fix the issues seen with a recent fix to prevent
tunnel-in-tunnel frames from being generated with GRO.  The fix itself is
correct for now as long as we do not add any devices that support
NETIF_F_GSO_GRE_CSUM.  When such a device is added it could have the
potential to mess things up due to the fact that the outer transport header
points to the outer UDP header and not the GRE header as would be expected.

Fixes: fac8e0f579695 ("tunnels: Don't apply GRO to multiple layers of encapsulation.")
Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/fou.c