summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2005-11-08 09:41:56 -0800
committerDavid S. Miller <davem@davemloft.net>2005-11-08 09:41:56 -0800
commit89f5f0aeed14ac7245f760b0b96c9269c87bcbbe (patch)
tree8dae08b8c2c7b61c6207d9189196b3c28d1cb8d4 /net
parenta51482bde22f99c63fbbb57d5d46cc666384e379 (diff)
downloadop-kernel-dev-89f5f0aeed14ac7245f760b0b96c9269c87bcbbe.zip
op-kernel-dev-89f5f0aeed14ac7245f760b0b96c9269c87bcbbe.tar.gz
[IPV4]: Fix ip_queue_xmit identity increment for TSO packets
When ip_queue_xmit calls ip_select_ident_more for IP identity selection it gives it the wrong packet count for TSO packets. The ip_select_* functions expect one less than the number of packets, so we need to subtract one for TSO packets. This bug was diagnosed and fixed by Tom Young. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/ip_output.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index df7f20d..11c2f68 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -353,7 +353,8 @@ packet_routed:
ip_options_build(skb, opt, inet->daddr, rt, 0);
}
- ip_select_ident_more(iph, &rt->u.dst, sk, skb_shinfo(skb)->tso_segs);
+ ip_select_ident_more(iph, &rt->u.dst, sk,
+ (skb_shinfo(skb)->tso_segs ?: 1) - 1);
/* Add an IP checksum. */
ip_send_check(iph);
OpenPOWER on IntegriCloud