---

yaml --- r: 243707 b: refs/heads/master c: 4dd5ffe h: refs/heads/master i: 243705: 4451438 243703: 44238c8 v: v3
git-mirror · Apr 2, 2011 · 33b6988 · 33b6988
1 parent 1165434
commit 33b6988
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c261344d3ce3edac781f9d3c7eabe2e96d8e8fe8
+refs/heads/master: 4dd5ffe4fc36128dc86568ddeaeae359e6037762
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
@@ -2598,8 +2598,8 @@ static inline int dev_ethtool_get_settings(struct net_device *dev,
 
 static inline u32 dev_ethtool_get_rx_csum(struct net_device *dev)
 {
-	if (dev->hw_features & NETIF_F_RXCSUM)
-		return !!(dev->features & NETIF_F_RXCSUM);
+	if (dev->features & NETIF_F_RXCSUM)
+		return 1;
 	if (!dev->ethtool_ops || !dev->ethtool_ops->get_rx_csum)
 		return 0;
 	return dev->ethtool_ops->get_rx_csum(dev);