From 33b6988758736dbf507cf86a54c3993663cefeff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Date: Wed, 30 Mar 2011 23:58:08 +0000 Subject: [PATCH] --- yaml --- r: 243707 b: refs/heads/master c: 4dd5ffe4fc36128dc86568ddeaeae359e6037762 h: refs/heads/master i: 243705: 44514383667e2bdc1a498d92bfc5de6cf40f45c7 243703: 44238c88aed451e16efd88f05f869f4c270fe776 v: v3 --- [refs] | 2 +- trunk/include/linux/netdevice.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ce2a2ca80870..205244517859 100644 --- 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 index 5eeb2cd3631c..0249fe7e3872 100644 --- 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);