From 2f858ac08b257406f2a1851f6f6fe118a8572269 Mon Sep 17 00:00:00 2001
From: Ed Cashin <ecashin@coraid.com>
Date: Wed, 19 Sep 2012 15:49:00 +0000
Subject: [PATCH] --- yaml --- r: 323096 b: refs/heads/master c:
 c0d680e577ff171e7b37dbdb1b1bf5451e851f04 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1f0a194dcdad..82983847cc0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8babe8cc6570ed896b7b596337eb8fe730c3ff45
+refs/heads/master: c0d680e577ff171e7b37dbdb1b1bf5451e851f04
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index ac7609d85187..89e33a5d4d93 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -2134,7 +2134,8 @@ static bool can_checksum_protocol(netdev_features_t features, __be16 protocol)
 static netdev_features_t harmonize_features(struct sk_buff *skb,
 	__be16 protocol, netdev_features_t features)
 {
-	if (!can_checksum_protocol(features, protocol)) {
+	if (skb->ip_summed != CHECKSUM_NONE &&
+	    !can_checksum_protocol(features, protocol)) {
 		features &= ~NETIF_F_ALL_CSUM;
 		features &= ~NETIF_F_SG;
 	} else if (illegal_highdma(skb->dev, skb)) {