From 2d201ea449bb724db67dc7d1b03171288899803d Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Thu, 28 Jun 2007 13:44:37 -0700 Subject: [PATCH] --- yaml --- r: 58943 b: refs/heads/master c: a298830cd026b4c0cde45ef3679a5f68a17577e6 h: refs/heads/master i: 58941: 0fbf94d04c3626e8f0b57b8a8dde27430fb5c2d0 58939: 3d76c383f9b535127f9703ae2a92d6640477239d 58935: 05b1cd2828222768339b1c18d61611458978f4f6 58927: 59a23c9d0cd07df5ea22b508476e266a5ca7a561 58911: e93165ef99675b3298b632421496b16e146586dc 58879: c74f6afccdab971c83f9a95ac0120d36e211b0a4 v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0798f37946b3..668ed95ac60d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58e50a904ec78caf4ca938801c031413b0d3f962 +refs/heads/master: a298830cd026b4c0cde45ef3679a5f68a17577e6 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 36e9bf8ec4af..6dce9d2d46f2 100644 --- a/trunk/net/core/dev.c +++ b/trunk/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; }