diff options
| author | Simon Horman <simon.horman@netronome.com> | 2016-08-15 13:06:24 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-15 13:37:12 -0700 |
| commit | 3d7b33209201cbfa090d614db993571ca3c6b090 (patch) | |
| tree | 74bfdb78880b3b52fd2d6541106b00a82d2263e0 /include/net/gre.h | |
| parent | 5e457896986e16c440c97bb94b9ccd95dd157292 (diff) | |
| download | linux-3d7b33209201cbfa090d614db993571ca3c6b090.tar.gz linux-3d7b33209201cbfa090d614db993571ca3c6b090.tar.bz2 linux-3d7b33209201cbfa090d614db993571ca3c6b090.zip | |
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>
Diffstat (limited to 'include/net/gre.h')
| -rw-r--r-- | include/net/gre.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/gre.h b/include/net/gre.h index 7a54a31d1d4c..73ea256eb7d7 100644 --- a/include/net/gre.h +++ b/include/net/gre.h @@ -104,6 +104,7 @@ static inline void gre_build_header(struct sk_buff *skb, int hdr_len, skb_push(skb, hdr_len); + skb_set_inner_protocol(skb, proto); skb_reset_transport_header(skb); greh = (struct gre_base_hdr *)skb->data; greh->flags = gre_tnl_flags_to_gre_flags(flags); |