diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-04 10:39:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-04 10:39:12 -0700 |
| commit | 083dd8b8aacfcb62d65fb53ec744090879dd8150 (patch) | |
| tree | d48017ad6caa13f5a31c23186b16c36a84776c49 /include/linux/netdevice.h | |
| parent | 95b8fbada76d978ce13a26785f8b85ff54478bb2 (diff) | |
| parent | a14b289d4614bb3b25d0455d68f72f3c7b4cc8e8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 423a5447d2ed..a4664cc68e2b 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2599,8 +2599,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); |