diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-05-12 23:01:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-12 23:01:55 -0400 |
| commit | 5c5095494fb545f53b80cbb7539679a10a3472a6 (patch) | |
| tree | d7c40cd66a58030ddef369bcb9acd8d95e2ac864 /include/linux/netdevice.h | |
| parent | be2net: Fix to prevent flooding of TX queue (diff) | |
| parent | ipv4: Elide use of rt->rt_dst in ip_forward() (diff) | |
| download | linux-dev-5c5095494fb545f53b80cbb7539679a10a3472a6.tar.xz linux-dev-5c5095494fb545f53b80cbb7539679a10a3472a6.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-next-2.6
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index e7244ed1f9a8..1d9696a9ee4d 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1097,10 +1097,14 @@ struct net_device { #define NETIF_F_ALL_TSO (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN) +#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_FCOE_CRC) + NETIF_F_SCTP_CSUM | \ + NETIF_F_ALL_FCOE) /* * If one device supports one of these features, then enable them @@ -2561,6 +2565,7 @@ u32 netdev_increment_features(u32 all, u32 one, u32 mask); u32 netdev_fix_features(struct net_device *dev, u32 features); int __netdev_update_features(struct net_device *dev); void netdev_update_features(struct net_device *dev); +void netdev_change_features(struct net_device *dev); void netif_stacked_transfer_operstate(const struct net_device *rootdev, struct net_device *dev); |