Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a298830cd026b4c0cde45ef3679a5f68a17577e6
Commit:     a298830cd026b4c0cde45ef3679a5f68a17577e6
Parent:     58e50a904ec78caf4ca938801c031413b0d3f962
Author:     Herbert Xu <[EMAIL PROTECTED]>
AuthorDate: Thu Jun 28 13:44:37 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Tue Jul 10 22:16:19 2007 -0700

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 net/core/dev.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/core/dev.c b/net/core/dev.c
index 36e9bf8..6dce9d2 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;
        }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to