aboutsummaryrefslogtreecommitdiff
path: root/net/core/dev.c
diff options
context:
space:
mode:
authorJerry Chu <hkchu@google.com>2014-07-14 15:54:46 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-28 08:06:01 -0700
commit9b6cdedfa3cfc62b2edf4d4abbda2263bd062684 (patch)
tree3702f385ba5d1635e43e04e26310981a42d42c2b /net/core/dev.c
parentdab45ea356389bfed8dde8c3566151f1d26f34d8 (diff)
downloadlinux-linaro-stable-9b6cdedfa3cfc62b2edf4d4abbda2263bd062684.tar.gz
net-gre-gro: Fix a bug that breaks the forwarding path
[ Upstream commit c3caf1192f904de2f1381211f564537235d50de3 ] Fixed a bug that was introduced by my GRE-GRO patch (bf5a755f5e9186406bbf50f4087100af5bd68e40 net-gre-gro: Add GRE support to the GRO stack) that breaks the forwarding path because various GSO related fields were not set. The bug will cause on the egress path either the GSO code to fail, or a GRE-TSO capable (NETIF_F_GSO_GRE) NICs to choke. The following fix has been tested for both cases. Signed-off-by: H.K. Jerry Chu <hkchu@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 051f17d6ff75..37bddf729e77 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4058,6 +4058,8 @@ static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb)
skb->vlan_tci = 0;
skb->dev = napi->dev;
skb->skb_iif = 0;
+ skb->encapsulation = 0;
+ skb_shinfo(skb)->gso_type = 0;
skb->truesize = SKB_TRUESIZE(skb_end_offset(skb));
napi->skb = skb;