Patchwork [net,1/3] Revert "ip_gre: increase inner ip header ID during segmentation"

login
register
mail settings
Submitter Pravin B Shelar
Date March 25, 2013, 3:36 a.m.
Message ID <1364182576-1700-1-git-send-email-pshelar@nicira.com>
Download mbox | patch
Permalink /patch/230570/
State Accepted
Delegated to: David Miller
Headers show

Comments

Pravin B Shelar - March 25, 2013, 3:36 a.m.
This reverts commit 10c0d7ed32b7c273970a20e211c08ab46fea3c26.
Next commit makes this commit unnecessary.

CC: Cong Wang <amwang@redhat.com>
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
---
 net/ipv4/gre.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

Patch

diff --git a/net/ipv4/gre.c b/net/ipv4/gre.c
index e20631c..7a4c710 100644
--- a/net/ipv4/gre.c
+++ b/net/ipv4/gre.c
@@ -125,9 +125,8 @@  static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
 	netdev_features_t enc_features;
 	int ghl = GRE_HEADER_SECTION;
 	struct gre_base_hdr *greh;
-	struct iphdr *iph;
 	int mac_len = skb->mac_len;
-	int tnl_hlen, id;
+	int tnl_hlen;
 	bool csum;
 
 	if (unlikely(skb_shinfo(skb)->gso_type &
@@ -171,8 +170,6 @@  static struct sk_buff *gre_gso_segment(struct sk_buff *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);
 	segs = skb_mac_gso_segment(skb, enc_features);
@@ -182,8 +179,6 @@  static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
 	skb = segs;
 	tnl_hlen = skb_tnl_header_len(skb);
 	do {
-		iph = (struct iphdr *)skb->data;
-		iph->id = htons(id++);
 		__skb_push(skb, ghl);
 		if (csum) {
 			__be32 *pcsum;