diff --git a/[refs] b/[refs]
index 3a31b0146246..4c274ecdcc45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af1905dbec44445d75851996819ac2203670bd0f
+refs/heads/master: 66c68bcc489fadd4f5e8839e966e3a366e50d1d5
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 3c5fbfbb3181..35dfb8318483 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -1685,10 +1685,10 @@ EXPORT_SYMBOL(netif_device_attach);
 
 static bool can_checksum_protocol(unsigned long features, __be16 protocol)
 {
-	return ((features & NETIF_F_GEN_CSUM) ||
-		((features & NETIF_F_IP_CSUM) &&
+	return ((features & NETIF_F_NO_CSUM) ||
+		((features & NETIF_F_V4_CSUM) &&
 		 protocol == htons(ETH_P_IP)) ||
-		((features & NETIF_F_IPV6_CSUM) &&
+		((features & NETIF_F_V6_CSUM) &&
 		 protocol == htons(ETH_P_IPV6)) ||
 		((features & NETIF_F_FCOE_CRC) &&
 		 protocol == htons(ETH_P_FCOE)));