diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2013-03-24 17:36:16 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-25 12:29:54 -0400 |
| commit | 9cb690d1b4a798d5c7af022047846f42f273d873 (patch) | |
| tree | 5055e049eef9011cf9484d07f42ca9d2e11130ae /net | |
| parent | 5f64a7dbf593c2317f132c8252d04cdfe8d4b104 (diff) | |
| download | blackbird-op-linux-9cb690d1b4a798d5c7af022047846f42f273d873.tar.gz blackbird-op-linux-9cb690d1b4a798d5c7af022047846f42f273d873.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/gre.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/ipv4/gre.c b/net/ipv4/gre.c index e20631cb4185..7a4c710c4cdd 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; |
