net: fix can_checksum_protocol() arguments swap
authorEric Dumazet <eric.dumazet@gmail.com>
Wed, 19 Jan 2011 00:51:36 +0000 (00:51 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 19 Jan 2011 22:15:21 +0000 (14:15 -0800)
commit 0363466866d901fbc (net offloading: Convert checksums to use
centrally computed features.) mistakenly swapped can_checksum_protocol()
arguments.

This broke IPv6 on bnx2 for instance, on NIC without TCPv6 checksum
offloads.

Reported-by: Hans de Bruin <jmdebruin@xmsnet.nl>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/dev.c

index 4c58d11d3b68b79f1d981473d31bb474b43b290e..8393ec408cd4d9adea5314e69cf391561c30570a 100644 (file)
@@ -2001,7 +2001,7 @@ static bool can_checksum_protocol(unsigned long features, __be16 protocol)
 
 static int harmonize_features(struct sk_buff *skb, __be16 protocol, int features)
 {
-       if (!can_checksum_protocol(protocol, features)) {
+       if (!can_checksum_protocol(features, protocol)) {
                features &= ~NETIF_F_ALL_CSUM;
                features &= ~NETIF_F_SG;
        } else if (illegal_highdma(skb->dev, skb)) {