---

yaml --- r: 231936 b: refs/heads/master c: d402786 h: refs/heads/master v: v3
git-mirror · Jan 19, 2011 · 9e55a5c · 9e55a5c
1 parent 4a03a5f
commit 9e55a5c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8f3ab4290f1e720166e888ea2a1d1d44c4d15dd
+refs/heads/master: d402786ea4f8433774a812d6b8635e737425cddd
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -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)) {