Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0d05535d413322341f89c77f32936b4df296ac5a

Authored by Pravin B Shelar
Committed by David S. Miller
1 parent 9b3eb5edf3
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

vxlan: Fix TCPv6 segmentation. 

This patch set correct skb->protocol so that inner packet can
lookup correct gso handler.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 6 additions and 1 deletions Side-by-side Diff

... ... @@ -2311,8 +2311,10 @@
2311 2311 struct sk_buff *segs = ERR_PTR(-EINVAL);
2312 2312 int mac_len = skb->mac_len;
2313 2313 int tnl_hlen = skb_inner_mac_header(skb) - skb_transport_header(skb);
2314   - int outer_hlen;
  2314 + struct ethhdr *inner_eth = (struct ethhdr *)skb_inner_mac_header(skb);
  2315 + __be16 protocol = skb->protocol;
2315 2316 netdev_features_t enc_features;
  2317 + int outer_hlen;
2316 2318  
2317 2319 if (unlikely(!pskb_may_pull(skb, tnl_hlen)))
2318 2320 goto out;
... ... @@ -2322,6 +2324,8 @@
2322 2324 skb_reset_mac_header(skb);
2323 2325 skb_set_network_header(skb, skb_inner_network_offset(skb));
2324 2326 skb->mac_len = skb_inner_network_offset(skb);
  2327 + inner_eth = (struct ethhdr *)skb_mac_header(skb);
  2328 + skb->protocol = inner_eth->h_proto;
2325 2329  
2326 2330 /* segment inner packet. */
2327 2331 enc_features = skb->dev->hw_enc_features & netif_skb_features(skb);
... ... @@ -2358,6 +2362,7 @@
2358 2362  
2359 2363 }
2360 2364 skb->ip_summed = CHECKSUM_NONE;
  2365 + skb->protocol = protocol;
2361 2366 } while ((skb = skb->next));
2362 2367 out:
2363 2368 return segs;