mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
Revert "ip_gre: increase inner ip header ID during segmentation"
This reverts commit 10c0d7ed32
.
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>
This commit is contained in:
parent
5f64a7dbf5
commit
9cb690d1b4
1 changed files with 1 additions and 6 deletions
|
@ -125,9 +125,8 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
|
||||||
netdev_features_t enc_features;
|
netdev_features_t enc_features;
|
||||||
int ghl = GRE_HEADER_SECTION;
|
int ghl = GRE_HEADER_SECTION;
|
||||||
struct gre_base_hdr *greh;
|
struct gre_base_hdr *greh;
|
||||||
struct iphdr *iph;
|
|
||||||
int mac_len = skb->mac_len;
|
int mac_len = skb->mac_len;
|
||||||
int tnl_hlen, id;
|
int tnl_hlen;
|
||||||
bool csum;
|
bool csum;
|
||||||
|
|
||||||
if (unlikely(skb_shinfo(skb)->gso_type &
|
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_set_network_header(skb, skb_inner_network_offset(skb));
|
||||||
skb->mac_len = skb_inner_network_offset(skb);
|
skb->mac_len = skb_inner_network_offset(skb);
|
||||||
|
|
||||||
iph = ip_hdr(skb);
|
|
||||||
id = ntohs(iph->id);
|
|
||||||
/* segment inner packet. */
|
/* segment inner packet. */
|
||||||
enc_features = skb->dev->hw_enc_features & netif_skb_features(skb);
|
enc_features = skb->dev->hw_enc_features & netif_skb_features(skb);
|
||||||
segs = skb_mac_gso_segment(skb, enc_features);
|
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;
|
skb = segs;
|
||||||
tnl_hlen = skb_tnl_header_len(skb);
|
tnl_hlen = skb_tnl_header_len(skb);
|
||||||
do {
|
do {
|
||||||
iph = (struct iphdr *)skb->data;
|
|
||||||
iph->id = htons(id++);
|
|
||||||
__skb_push(skb, ghl);
|
__skb_push(skb, ghl);
|
||||||
if (csum) {
|
if (csum) {
|
||||||
__be32 *pcsum;
|
__be32 *pcsum;
|
||||||
|
|
Loading…
Reference in a new issue