summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPravin B Shelar <pshelar@nicira.com>2013-03-24 17:36:29 +0000
committerDavid S. Miller <davem@davemloft.net>2013-03-26 13:50:05 -0400
commit330305cc4a6b0cb75c22fc01b8826f0ad755550f (patch)
tree91d73aaccb12054ba88c538c78a9c1559a0218c8 /net
parent9fe16b78ee17579cb4f333534cf7043e94c67024 (diff)
downloadblackbird-op-linux-330305cc4a6b0cb75c22fc01b8826f0ad755550f.tar.gz
blackbird-op-linux-330305cc4a6b0cb75c22fc01b8826f0ad755550f.zip
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> Signed-off-by: Pravin B Shelar <pshelar@nicira.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/af_inet.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 68f6a94f7661..c929d9c1c4b6 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1333,8 +1333,7 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb,
iph->frag_off |= htons(IP_MF);
offset += (skb->len - skb->mac_len - iph->ihl * 4);
} 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->check = 0;
OpenPOWER on IntegriCloud