diff options
author | David S. Miller <davem@davemloft.net> | 2011-04-04 17:39:12 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-04 17:39:12 (GMT) |
commit | 083dd8b8aacfcb62d65fb53ec744090879dd8150 (patch) | |
tree | d48017ad6caa13f5a31c23186b16c36a84776c49 /include/linux | |
parent | 95b8fbada76d978ce13a26785f8b85ff54478bb2 (diff) | |
parent | a14b289d4614bb3b25d0455d68f72f3c7b4cc8e8 (diff) | |
download | linux-fsl-qoriq-083dd8b8aacfcb62d65fb53ec744090879dd8150.tar.xz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/netdevice.h | 4 | ||||
-rw-r--r-- | include/linux/usb/usbnet.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 423a544..a4664cc6 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); diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index 201f222..3c7329b 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h @@ -97,6 +97,8 @@ struct driver_info { #define FLAG_LINK_INTR 0x0800 /* updates link (carrier) status */ +#define FLAG_POINTTOPOINT 0x1000 /* possibly use "usb%d" names */ + /* * Indicates to usbnet, that USB driver accumulates multiple IP packets. * Affects statistic (counters) and short packet handling. |