summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMichał Mirosław <mirq-linux@rere.qmqm.pl>2011-03-30 23:58:08 +0000
committerDavid S. Miller <davem@davemloft.net>2011-04-01 20:23:25 -0700
commit4dd5ffe4fc36128dc86568ddeaeae359e6037762 (patch)
treea1d36b66e8125ce9778ab96fedce028c78654c21 /include
parentc261344d3ce3edac781f9d3c7eabe2e96d8e8fe8 (diff)
downloadlinux-stable-4dd5ffe4fc36128dc86568ddeaeae359e6037762.tar.gz
linux-stable-4dd5ffe4fc36128dc86568ddeaeae359e6037762.tar.bz2
linux-stable-4dd5ffe4fc36128dc86568ddeaeae359e6037762.zip
net: Fix dev dev_ethtool_get_rx_csum() for forced NETIF_F_RXCSUM
dev_ethtool_get_rx_csum() won't report rx checksumming when it's not changeable and driver is converted to hw_features and friends. Fix this. (dev->hw_features & NETIF_F_RXCSUM) check is dropped - if the ethtool_ops->get_rx_csum is set, then driver is not coverted, yet. Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/netdevice.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 5eeb2cd3631c..0249fe7e3872 100644
--- a/include/linux/netdevice.h
+++ b/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);