diff options
author | Cong Wang <amwang@redhat.com> | 2013-03-21 20:31:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-03-22 10:23:34 -0400 |
commit | d6a8c36dd6f6f06f046e5c61d3fb39b777c3bdc6 (patch) | |
tree | 29ae533ed164da23912125dd0be28df5dda6c051 /net/ipv4 | |
parent | 10c0d7ed32b7c273970a20e211c08ab46fea3c26 (diff) |
udp: increase inner ip header ID during segmentation
Similar to GRE tunnel, UDP tunnel should take care of IP header ID
too.
Cc: Pravin B Shelar <pshelar@nicira.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/udp.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 7117d1467b02..3c362eee3f2d 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
@@ -2304,7 +2304,8 @@ static struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb, | |||
2304 | struct sk_buff *segs = ERR_PTR(-EINVAL); | 2304 | struct sk_buff *segs = ERR_PTR(-EINVAL); |
2305 | int mac_len = skb->mac_len; | 2305 | int mac_len = skb->mac_len; |
2306 | int tnl_hlen = skb_inner_mac_header(skb) - skb_transport_header(skb); | 2306 | int tnl_hlen = skb_inner_mac_header(skb) - skb_transport_header(skb); |
2307 | int outer_hlen; | 2307 | int outer_hlen, id; |
2308 | struct iphdr *iph; | ||
2308 | netdev_features_t enc_features; | 2309 | netdev_features_t enc_features; |
2309 | 2310 | ||
2310 | if (unlikely(!pskb_may_pull(skb, tnl_hlen))) | 2311 | if (unlikely(!pskb_may_pull(skb, tnl_hlen))) |
@@ -2315,6 +2316,8 @@ static struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb, | |||
2315 | skb_reset_mac_header(skb); | 2316 | skb_reset_mac_header(skb); |
2316 | skb_set_network_header(skb, skb_inner_network_offset(skb)); | 2317 | skb_set_network_header(skb, skb_inner_network_offset(skb)); |
2317 | skb->mac_len = skb_inner_network_offset(skb); | 2318 | skb->mac_len = skb_inner_network_offset(skb); |
2319 | iph = ip_hdr(skb); | ||
2320 | id = ntohs(iph->id); | ||
2318 | 2321 | ||
2319 | /* segment inner packet. */ | 2322 | /* segment inner packet. */ |
2320 | enc_features = skb->dev->hw_enc_features & netif_skb_features(skb); | 2323 | enc_features = skb->dev->hw_enc_features & netif_skb_features(skb); |
@@ -2329,6 +2332,8 @@ static struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb, | |||
2329 | int udp_offset = outer_hlen - tnl_hlen; | 2332 | int udp_offset = outer_hlen - tnl_hlen; |
2330 | 2333 | ||
2331 | skb->mac_len = mac_len; | 2334 | skb->mac_len = mac_len; |
2335 | iph = (struct iphdr *)skb_inner_network_header(skb); | ||
2336 | iph->id = htons(id++); | ||
2332 | 2337 | ||
2333 | skb_push(skb, outer_hlen); | 2338 | skb_push(skb, outer_hlen); |
2334 | skb_reset_mac_header(skb); | 2339 | skb_reset_mac_header(skb); |