diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-17 23:49:28 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-17 23:49:28 +0400 |
| commit | 3d68bd0010d2c9bc9ad6004fdcc4d6a56dcae199 (patch) | |
| tree | 013ac9bd1bc68d1d9dda17346eefc617aeb47265 /include | |
| parent | efcbae253f97bf82e7befd372da3ad5995a53f1a (diff) | |
| parent | 05e9a2f67849e427f8900bad0a3f2a939e8dd3d6 (diff) | |
| download | linux-3d68bd0010d2c9bc9ad6004fdcc4d6a56dcae199.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
Bluetooth: Fix crash with incoming L2CAP connections
Bluetooth: Fix regression in L2CAP connection procedure
gianfar: rx parser
r6040: only disable RX interrupt if napi_schedule_prep is successful
net: remove NETIF_F_ALL_TX_OFFLOADS
net: sctp: fix checksum marking for outgoing packets
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netdevice.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 54b8b4d7b68f..9e19477991ad 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1097,12 +1097,6 @@ struct net_device { #define NETIF_F_ALL_FCOE (NETIF_F_FCOE_CRC | NETIF_F_FCOE_MTU | \ NETIF_F_FSO) -#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_ALL_FCOE) - /* * If one device supports one of these features, then enable them * for all in netdev_increment_features. |