]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.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)
committerSeth Forshee <seth.forshee@canonical.com>
Fri, 7 Oct 2016 18:43:14 +0000 (13:43 -0500)
commit3945b4f32c19dea65ddb6bf767c2fe65c50412c4
tree73653a49ef6811df385e4b17cad25d41cb782922
parentf062e9b91c7841d70168f22bd1939364216e92f5
gro: Allow tunnel stacking in the case of FOU/GUE

BugLink: http://bugs.launchpad.net/bugs/1631287
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>
(cherry picked from commit c3483384ee511ee2af40b4076366cd82a6a47b86)
Acked-by: Kamal Mostafa <kamal@canonical.com>
Acked-by: Steve Beattie <steve.beattie@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
net/ipv4/fou.c