Revert "udp: increase inner ip header ID during segmentation"

This reverts commit d6a8c36dd6f6f06f046e5c61d3fb39b777c3bdc6.
Next commit makes this commit unnecessary.

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

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 3c362eee3f2d467c1b21e04ab28120870f64400c..7117d1467b020c5aec59ca87ff8f6b91422a8816 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -2304,8 +2304,7 @@ 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, id;
-       struct iphdr *iph;
+       int outer_hlen;
        netdev_features_t enc_features;
 
        if (unlikely(!pskb_may_pull(skb, tnl_hlen)))
@@ -2316,8 +2315,6 @@ 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);
@@ -2332,8 +2329,6 @@ 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);