diff options
| author | Tom Herbert <therbert@google.com> | 2014-10-30 16:40:56 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-31 00:51:56 +0100 |
| commit | 14051f0452a2c26a3f4791e6ad6a435e8f1945ff (patch) | |
| tree | b9b2c17b648ee9f485c9c8751ff1a3d4c781f77a | |
| parent | Merge branch 'mellanox-net' (diff) | |
| download | linux-14051f0452a2c26a3f4791e6ad6a435e8f1945ff.tar.xz linux-14051f0452a2c26a3f4791e6ad6a435e8f1945ff.zip | |
gre: Use inner mac length when computing tunnel length
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>
| -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 f6e345c0bc23..bb5947b0ce2d 100644 --- a/net/ipv4/gre_offload.c +++ b/net/ipv4/gre_offload.c @@ -47,7 +47,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; |