diff options
| author | Jesse Gross <jesse@nicira.com> | 2014-11-10 20:45:13 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-10 21:09:45 +0100 |
| commit | cfdf1e1ba5bf55e095cf4bcaa9585c4759f239e8 (patch) | |
| tree | 6844467a4be67dcc20519696ec9cee87556d779a /drivers/net/vxlan.c | |
| parent | Merge branch 'cxgb4-net' (diff) | |
| download | linux-cfdf1e1ba5bf55e095cf4bcaa9585c4759f239e8.tar.xz linux-cfdf1e1ba5bf55e095cf4bcaa9585c4759f239e8.zip | |
udptunnel: Add SKB_GSO_UDP_TUNNEL during gro_complete.
When doing GRO processing for UDP tunnels, we never add
SKB_GSO_UDP_TUNNEL to gso_type - only the type of the inner protocol
is added (such as SKB_GSO_TCPV4). The result is that if the packet is
later resegmented we will do GSO but not treat it as a tunnel. This
results in UDP fragmentation of the outer header instead of (i.e.) TCP
segmentation of the inner header as was originally on the wire.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vxlan.c')
| -rw-r--r-- | drivers/net/vxlan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index ca309820d39e..cfb892b265e8 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -621,6 +621,8 @@ static int vxlan_gro_complete(struct sk_buff *skb, int nhoff) int vxlan_len = sizeof(struct vxlanhdr) + sizeof(struct ethhdr); int err = -ENOSYS; + udp_tunnel_gro_complete(skb, nhoff); + eh = (struct ethhdr *)(skb->data + nhoff + sizeof(struct vxlanhdr)); type = eh->h_proto; |