Commit 6fb2a756 authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller

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: default avatarWolfgang Walter <linux@stwm.de>
Signed-off-by: default avatarTom Herbert <therbert@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7cc78f8f
...@@ -247,6 +247,9 @@ static int gre_gro_complete(struct sk_buff *skb, int nhoff) ...@@ -247,6 +247,9 @@ static int gre_gro_complete(struct sk_buff *skb, int nhoff)
err = ptype->callbacks.gro_complete(skb, nhoff + grehlen); err = ptype->callbacks.gro_complete(skb, nhoff + grehlen);
rcu_read_unlock(); rcu_read_unlock();
skb_set_inner_mac_header(skb, nhoff + grehlen);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment