Revert "ip_gre: increase inner ip header ID during segmentation"
This reverts commit 10c0d7ed32b7c273970a20e211c08ab46fea3c26.
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/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 @@
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 @@
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 @@
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;
