gre: set inner_protocol on xmit
authorSimon Horman <simon.horman@netronome.com>
Mon, 15 Aug 2016 11:06:24 +0000 (13:06 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 15 Aug 2016 20:37:12 +0000 (13:37 -0700)
commit3d7b33209201cbfa090d614db993571ca3c6b090
tree74bfdb78880b3b52fd2d6541106b00a82d2263e0
parent5e457896986e16c440c97bb94b9ccd95dd157292
gre: set inner_protocol on xmit

Ensure that the inner_protocol is set on transmit so that GSO segmentation,
which relies on that field, works correctly.

This is achieved by setting the inner_protocol in gre_build_header rather
than each caller of that function. It ensures that the inner_protocol is
set when gre_fb_xmit() is used to transmit GRE which was not previously the
case.

I have observed this is not the case when OvS transmits GRE using
lwtunnel metadata (which it always does).

Fixes: 38720352412a ("gre: Use inner_proto to obtain inner header protocol")
Cc: Pravin Shelar <pshelar@ovn.org>
Acked-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/gre.h
net/ipv4/ip_gre.c
net/ipv6/ip6_gre.c