diff options
| author |   Pravin B Shelar <pshelar@nicira.com> | 2013-03-24 17:36:23 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-03-25 12:29:54 -0400 |
| commit | 5594c32187e4cb673d2ac815b1adb5a96d9f6254 (patch) | |
| tree | 623645d18896db416c43f1ecdbdf1cb2c5f6e1d5 /net | |
| parent | Revert "ip_gre: increase inner ip header ID during segmentation" (diff) | |
| download | linux-dev-5594c32187e4cb673d2ac815b1adb5a96d9f6254.tar.xz linux-dev-5594c32187e4cb673d2ac815b1adb5a96d9f6254.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/udp.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 3c362eee3f2d..7117d1467b02 100644 --- 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); |