From: Michał Mirosław Date: Wed, 30 Mar 2011 23:58:08 +0000 (+0000) Subject: net: Fix dev dev_ethtool_get_rx_csum() for forced NETIF_F_RXCSUM X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4dd5ffe4fc36128dc86568ddeaeae359e6037762;p=linux-beck.git 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 Signed-off-by: David S. Miller --- 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);