summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPravin B Shelar <pshelar@nicira.com>2013-03-24 21:36:29 +0400
committerDavid S. Miller <davem@davemloft.net>2013-03-25 20:30:25 +0400
commit25c7704d8bdcf6746dab4397953df51759924b37 (patch)
tree827ce8d9cf89b2a19c248ad3ea1ec0763760ff9d /include
parent5594c32187e4cb673d2ac815b1adb5a96d9f6254 (diff)
downloadlinux-25c7704d8bdcf6746dab4397953df51759924b37.tar.xz
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 490ab08127cebc25e3a26 (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>
Diffstat (limited to 'include')
-rw-r--r--include/net/ipip.h16
1 files changed, 6 insertions, 10 deletions
diff --git a/include/net/ipip.h b/include/net/ipip.h
index 0c046e3bca05..483b91a10bb2 100644
--- a/include/net/ipip.h
+++ b/include/net/ipip.h
@@ -74,15 +74,11 @@ static inline void tunnel_ip_select_ident(struct sk_buff *skb,
{
struct iphdr *iph = ip_hdr(skb);
- if (iph->frag_off & htons(IP_DF))
- iph->id = 0;
- else {
- /* Use inner packet iph-id if possible. */
- if (skb->protocol == htons(ETH_P_IP) && old_iph->id)
- iph->id = old_iph->id;
- else
- __ip_select_ident(iph, dst,
- (skb_shinfo(skb)->gso_segs ?: 1) - 1);
- }
+ /* Use inner packet iph-id if possible. */
+ if (skb->protocol == htons(ETH_P_IP) && old_iph->id)
+ iph->id = old_iph->id;
+ else
+ __ip_select_ident(iph, dst,
+ (skb_shinfo(skb)->gso_segs ?: 1) - 1);
}
#endif