[PATCH net 2/3] Revert "udp: increase inner ip header ID during segmentation"
From: Pravin B Shelar <hidden>
Date: 2013-03-25 03:37:27
Subsystem:
networking [general], the rest, user datagram protocol (udp) · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds, Willem de Bruijn
This reverts commit d6a8c36dd6f6f06f046e5c61d3fb39b777c3bdc6. Next commit makes this commit unnecessary. CC: Cong Wang <redacted> Signed-off-by: Pravin B Shelar <redacted> --- 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 3c362ee..7117d14 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);
--
1.7.1