Commit 6fb2a756 authored Nov 29, 2014 by Tom Herbert Committed by David S. Miller Dec 05, 2014

gre: Set inner mac header in gro complete



Set the inner mac header to point to the GRE payload when
doing GRO. This is needed if we proceed to send the packet
through GRE GSO which now uses the inner mac header instead
of inner network header to determine the length of encapsulation
headers.

Fixes: 14051f04 ("gre: Use inner mac length when computing tunnel length")
Reported-by: Wolfgang Walter <linux@stwm.de>
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 7cc78f8f

net/ipv4/gre_offload.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -247,6 +247,9 @@ static int gre_gro_complete(struct sk_buff *skb, int nhoff)
		err = ptype->callbacks.gro_complete(skb, nhoff + grehlen);

		rcu_read_unlock();

		skb_set_inner_mac_header(skb, nhoff + grehlen);

		return err;
		}