aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/fou.c
diff options
context:
space:
mode:
authorJesse Gross <jesse@nicira.com>2014-11-10 11:45:13 -0800
committerDavid S. Miller <davem@davemloft.net>2014-11-10 15:09:45 -0500
commitcfdf1e1ba5bf55e095cf4bcaa9585c4759f239e8 (patch)
tree6844467a4be67dcc20519696ec9cee87556d779a /net/ipv4/fou.c
parentMerge branch 'cxgb4-net' (diff)
downloadlinux-dev-cfdf1e1ba5bf55e095cf4bcaa9585c4759f239e8.tar.xz
linux-dev-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 'net/ipv4/fou.c')
-rw-r--r--net/ipv4/fou.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
index 32e78924e246..606c520ffd5a 100644
--- a/net/ipv4/fou.c
+++ b/net/ipv4/fou.c
@@ -133,6 +133,8 @@ static int fou_gro_complete(struct sk_buff *skb, int nhoff)
int err = -ENOSYS;
const struct net_offload **offloads;
+ udp_tunnel_gro_complete(skb, nhoff);
+
rcu_read_lock();
offloads = NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads;
ops = rcu_dereference(offloads[proto]);