From b95b87e5e0e9d10e7561845b239050454fe67857 Mon Sep 17 00:00:00 2001 From: Cong Wang Date: Fri, 22 Mar 2013 00:31:32 +0000 Subject: [PATCH] --- yaml --- r: 368602 b: refs/heads/master c: d6a8c36dd6f6f06f046e5c61d3fb39b777c3bdc6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/udp.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9c7c04a38673..3bb334fc28b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10c0d7ed32b7c273970a20e211c08ab46fea3c26 +refs/heads/master: d6a8c36dd6f6f06f046e5c61d3fb39b777c3bdc6 diff --git a/trunk/net/ipv4/udp.c b/trunk/net/ipv4/udp.c index 7117d1467b02..3c362eee3f2d 100644 --- a/trunk/net/ipv4/udp.c +++ b/trunk/net/ipv4/udp.c @@ -2304,7 +2304,8 @@ static struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb, struct sk_buff *segs = ERR_PTR(-EINVAL); int mac_len = skb->mac_len; int tnl_hlen = skb_inner_mac_header(skb) - skb_transport_header(skb); - int outer_hlen; + int outer_hlen, id; + struct iphdr *iph; netdev_features_t enc_features; if (unlikely(!pskb_may_pull(skb, tnl_hlen))) @@ -2315,6 +2316,8 @@ static struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb, skb_reset_mac_header(skb); skb_set_network_header(skb, skb_inner_network_offset(skb)); skb->mac_len = skb_inner_network_offset(skb); + iph = ip_hdr(skb); + id = ntohs(iph->id); /* segment inner packet. */ 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, int udp_offset = outer_hlen - tnl_hlen; skb->mac_len = mac_len; + iph = (struct iphdr *)skb_inner_network_header(skb); + iph->id = htons(id++); skb_push(skb, outer_hlen); skb_reset_mac_header(skb);