Commit 10c0d7ed authored by Cong Wang's avatar Cong Wang Committed by David S. Miller

ip_gre: increase inner ip header ID during segmentation

According to the previous discussion [1] on netdev list, DaveM insists
we should increase the IP header ID for each segmented packets.
This patch fixes it.

Cc: Pravin B Shelar <pshelar@nicira.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarCong Wang <amwang@redhat.com>

1. http://marc.info/?t=136384172700001&r=1&w=2Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e287a75c
...@@ -125,8 +125,9 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb, ...@@ -125,8 +125,9 @@ 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; int tnl_hlen, id;
bool csum; bool csum;
if (unlikely(skb_shinfo(skb)->gso_type & if (unlikely(skb_shinfo(skb)->gso_type &
...@@ -170,6 +171,8 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb, ...@@ -170,6 +171,8 @@ 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);
...@@ -179,6 +182,8 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb, ...@@ -179,6 +182,8 @@ 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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment