hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ipv4: Fix ip-header identification for gso packets. 

ip-header id needs to be incremented even if IP_DF flag is set.
This behaviour was changed in commit 490ab08127
(IP_GRE: Fix IP-Identification).

Following patch fixes it so that identification is always
incremented.

Reported-by: Cong Wang <amwang@redhat.com>
Acked-by: Cong Wang <amwang@redhat.com>
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
This commit is contained in:
Pravin B Shelar 2013-03-24 17:36:29 +00:00 committed by David S. Miller
parent 5594c32187
commit 25c7704d8b
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/net/ipip.h
View File

@ -74,15 +74,11 @@ static inline void tunnel_ip_select_ident(struct sk_buff *skb,
{ {
struct iphdr *iph = ip_hdr(skb); struct iphdr *iph = ip_hdr(skb);
if (iph->frag_off & htons(IP_DF)) /* Use inner packet iph-id if possible. */
iph->id = 0; if (skb->protocol == htons(ETH_P_IP) && old_iph->id)
else { iph->id = old_iph->id;
/* Use inner packet iph-id if possible. */ else
if (skb->protocol == htons(ETH_P_IP) && old_iph->id) __ip_select_ident(iph, dst,
iph->id = old_iph->id; (skb_shinfo(skb)->gso_segs ?: 1) - 1);
else
__ip_select_ident(iph, dst,
(skb_shinfo(skb)->gso_segs ?: 1) - 1);
}
} }
#endif #endif

3
net/ipv4/af_inet.c
View File

@ -1334,8 +1334,7 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb,
iph->frag_off |= htons(IP_MF); iph->frag_off |= htons(IP_MF);
offset += (skb->len - skb->mac_len - iph->ihl * 4); offset += (skb->len - skb->mac_len - iph->ihl * 4);
} else { } else {
if (!(iph->frag_off & htons(IP_DF))) iph->id = htons(id++);
iph->id = htons(id++);
} }
iph->tot_len = htons(skb->len - skb->mac_len); iph->tot_len = htons(skb->len - skb->mac_len);
iph->check = 0; iph->check = 0;