aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/netdevice.h
diff options
context:
space:
mode:
authorMichał Mirosław <mirq-linux@rere.qmqm.pl>2011-04-22 02:31:16 -0400
committerDavid S. Miller <davem@davemloft.net>2011-04-28 16:33:08 -0400
commitfa2bd7ff9247f4218dfc907db14d000cd7edd862 (patch)
treef84f98aa2a87b308589a814892e2a3503a7d689f /include/linux/netdevice.h
parentc4d27ef957cd9261c0bc8488edaf8390e412cd35 (diff)
net: allow user to change NETIF_F_HIGHDMA
NETIF_F_HIGHDMA is like any other TX offloads, so allow user to toggle it. This is needed later for bridge and bonding convertsion to hw_features. Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r--include/linux/netdevice.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index b7d0304762aa..e03af35843bc 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1080,7 +1080,7 @@ struct net_device {
1080 1080
1081 /* Features valid for ethtool to change */ 1081 /* Features valid for ethtool to change */
1082 /* = all defined minus driver/device-class-related */ 1082 /* = all defined minus driver/device-class-related */
1083#define NETIF_F_NEVER_CHANGE (NETIF_F_HIGHDMA | NETIF_F_VLAN_CHALLENGED | \ 1083#define NETIF_F_NEVER_CHANGE (NETIF_F_VLAN_CHALLENGED | \
1084 NETIF_F_LLTX | NETIF_F_NETNS_LOCAL) 1084 NETIF_F_LLTX | NETIF_F_NETNS_LOCAL)
1085#define NETIF_F_ETHTOOL_BITS (0x7f3fffff & ~NETIF_F_NEVER_CHANGE) 1085#define NETIF_F_ETHTOOL_BITS (0x7f3fffff & ~NETIF_F_NEVER_CHANGE)
1086 1086
@@ -1098,6 +1098,7 @@ struct net_device {
1098 1098
1099#define NETIF_F_ALL_TX_OFFLOADS (NETIF_F_ALL_CSUM | NETIF_F_SG | \ 1099#define NETIF_F_ALL_TX_OFFLOADS (NETIF_F_ALL_CSUM | NETIF_F_SG | \
1100 NETIF_F_FRAGLIST | NETIF_F_ALL_TSO | \ 1100 NETIF_F_FRAGLIST | NETIF_F_ALL_TSO | \
1101 NETIF_F_HIGHDMA | \
1101 NETIF_F_SCTP_CSUM | NETIF_F_FCOE_CRC) 1102 NETIF_F_SCTP_CSUM | NETIF_F_FCOE_CRC)
1102 1103
1103 /* 1104 /*