From 9e3b6f44f90d309b14da4146db9d2e70d45534df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Date: Fri, 22 Apr 2011 06:31:16 +0000 Subject: [PATCH] --- yaml --- r: 247013 b: refs/heads/master c: fa2bd7ff9247f4218dfc907db14d000cd7edd862 h: refs/heads/master i: 247011: 75375116d1f8d9b84084d4557186a55fab20aa84 v: v3 --- [refs] | 2 +- trunk/include/linux/netdevice.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bb1675006bd8..20989cb2ed6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c4d27ef957cd9261c0bc8488edaf8390e412cd35 +refs/heads/master: fa2bd7ff9247f4218dfc907db14d000cd7edd862 diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index b7d0304762aa..e03af35843bc 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -1080,7 +1080,7 @@ struct net_device { /* Features valid for ethtool to change */ /* = all defined minus driver/device-class-related */ -#define NETIF_F_NEVER_CHANGE (NETIF_F_HIGHDMA | NETIF_F_VLAN_CHALLENGED | \ +#define NETIF_F_NEVER_CHANGE (NETIF_F_VLAN_CHALLENGED | \ NETIF_F_LLTX | NETIF_F_NETNS_LOCAL) #define NETIF_F_ETHTOOL_BITS (0x7f3fffff & ~NETIF_F_NEVER_CHANGE) @@ -1098,6 +1098,7 @@ struct net_device { #define NETIF_F_ALL_TX_OFFLOADS (NETIF_F_ALL_CSUM | NETIF_F_SG | \ NETIF_F_FRAGLIST | NETIF_F_ALL_TSO | \ + NETIF_F_HIGHDMA | \ NETIF_F_SCTP_CSUM | NETIF_F_FCOE_CRC) /*