diff options
| author | Tom Herbert <therbert@google.com> | 2014-10-30 08:40:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-14 08:59:43 -0800 |
| commit | abe640984aa492652232b65d3579361cf6d461f5 (patch) | |
| tree | 046f57143c634397fe0bd532fc537933a12c55b5 /net/ipv4/gre_offload.c | |
| parent | 7699796d0414f711a2a0017a060530fab7939534 (diff) | |
| download | linux-stable-abe640984aa492652232b65d3579361cf6d461f5.tar.gz linux-stable-abe640984aa492652232b65d3579361cf6d461f5.tar.bz2 linux-stable-abe640984aa492652232b65d3579361cf6d461f5.zip | |
gre: Use inner mac length when computing tunnel length
[ Upstream commit 14051f0452a2c26a3f4791e6ad6a435e8f1945ff ]
Currently, skb_inner_network_header is used but this does not account
for Ethernet header for ETH_P_TEB. Use skb_inner_mac_header which
handles TEB and also should work with IP encapsulation in which case
inner mac and inner network headers are the same.
Tested: Ran TCP_STREAM over GRE, worked as expected.
Signed-off-by: Tom Herbert <therbert@google.com>
Acked-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv4/gre_offload.c')
| -rw-r--r-- | net/ipv4/gre_offload.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c index 2d24f293f977..8c8493ea6b1c 100644 --- a/net/ipv4/gre_offload.c +++ b/net/ipv4/gre_offload.c @@ -50,7 +50,7 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb, greh = (struct gre_base_hdr *)skb_transport_header(skb); - ghl = skb_inner_network_header(skb) - skb_transport_header(skb); + ghl = skb_inner_mac_header(skb) - skb_transport_header(skb); if (unlikely(ghl < sizeof(*greh))) goto out; |