mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
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: Cong Wang <amwang@redhat.com> 1. http://marc.info/?t=136384172700001&r=1&w=2 Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
e287a75c68
commit
10c0d7ed32
1 changed files with 6 additions and 1 deletions
|
@ -125,8 +125,9 @@ 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;
|
||||
int tnl_hlen, id;
|
||||
bool csum;
|
||||
|
||||
if (unlikely(skb_shinfo(skb)->gso_type &
|
||||
|
@ -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->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);
|
||||
|
@ -179,6 +182,8 @@ 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;
|
||||
|
|
Loading…
Reference in a new issue