gro: Allow tunnel stacking in the case of FOU/GUE
commitd8435bb5e8fb1d20c480756ed6b76121c4d2d50d
authorAlexander Duyck <aduyck@mirantis.com>
Tue, 29 Mar 2016 21:55:22 +0000 (29 14:55 -0700)
committerSasha Levin <alexander.levin@verizon.com>
Fri, 13 Jan 2017 17:21:59 +0000 (13 12:21 -0500)
tree1eb1539cd69fbf77255106cfd4339ce419f973bf
parent066b300e5be43cb61697539e2a3a9aac5afb422f
gro: Allow tunnel stacking in the case of FOU/GUE

[ Upstream commit c3483384ee511ee2af40b4076366cd82a6a47b86 ]

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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
net/ipv4/fou.c