This is a note to let you know that I've just added the patch titled gre: Set inner mac header in gro complete to the 3.17-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: gre-set-inner-mac-header-in-gro-complete.patch and it can be found in the queue-3.17 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Sun Dec 14 08:37:01 PST 2014 From: Tom Herbert <therbert@xxxxxxxxxx> Date: Sat, 29 Nov 2014 09:59:45 -0800 Subject: gre: Set inner mac header in gro complete From: Tom Herbert <therbert@xxxxxxxxxx> [ Upstream commit 6fb2a756739aa507c1fd5b8126f0bfc2f070dc46 ] 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: 14051f0452a2 ("gre: Use inner mac length when computing tunnel length") Reported-by: Wolfgang Walter <linux@xxxxxxx> Signed-off-by: Tom Herbert <therbert@xxxxxxxxxx> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- net/ipv4/gre_offload.c | 3 +++ 1 file changed, 3 insertions(+) --- a/net/ipv4/gre_offload.c +++ b/net/ipv4/gre_offload.c @@ -279,6 +279,9 @@ static int gre_gro_complete(struct sk_bu err = ptype->callbacks.gro_complete(skb, nhoff + grehlen); rcu_read_unlock(); + + skb_set_inner_mac_header(skb, nhoff + grehlen); + return err; } Patches currently in stable-queue which might be from therbert@xxxxxxxxxx are queue-3.17/gre-set-inner-mac-header-in-gro-complete.patch queue-3.17/vxlan-fix-boolean-flip-in-vxlan_f_udp_zero_csum6_.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html