---

yaml --- r: 323096 b: refs/heads/master c: c0d680e h: refs/heads/master v: v3
git-mirror · Sep 21, 2012 · 2f858ac · 2f858ac
1 parent 589d505
commit 2f858ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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)) {