From 9e55a5cfd222517a2adc133d4e94a8b1f471dbe9 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 19 Jan 2011 00:51:36 +0000
Subject: [PATCH] --- yaml --- r: 231936 b: refs/heads/master c:
 d402786ea4f8433774a812d6b8635e737425cddd h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ac61766357f1..5ebd768068b0 100644
--- 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
index 4c58d11d3b68..8393ec408cd4 100644
--- 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)) {