summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-06-28 13:44:37 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-07-10 22:16:19 -0700
commita298830cd026b4c0cde45ef3679a5f68a17577e6 (patch)
tree211a4d13360027e8136b32453ebc6d97a87b8ef7 /net
parent58e50a904ec78caf4ca938801c031413b0d3f962 (diff)
[NET]: Fix TX checksum feature check
This patch fixes a boolean error in the new TX checksum check that causes bogus TSO packets to be generated. 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/core/dev.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 36e9bf8ec4af..6dce9d2d46f2 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1509,11 +1509,11 @@ int dev_queue_xmit(struct sk_buff *skb)
skb_set_transport_header(skb, skb->csum_start -
skb_headroom(skb));
- if (!(dev->features & NETIF_F_GEN_CSUM)
- || ((dev->features & NETIF_F_IP_CSUM)
- && skb->protocol == htons(ETH_P_IP))
- || ((dev->features & NETIF_F_IPV6_CSUM)
- && skb->protocol == htons(ETH_P_IPV6)))
+ if (!(dev->features & NETIF_F_GEN_CSUM) &&
+ !((dev->features & NETIF_F_IP_CSUM) &&
+ skb->protocol == htons(ETH_P_IP)) &&
+ !((dev->features & NETIF_F_IPV6_CSUM) &&
+ skb->protocol == htons(ETH_P_IPV6)))
if (skb_checksum_help(skb))
goto out_kfree_skb;
}