diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-28 17:17:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-28 17:17:16 -0400 |
| commit | 5f2feca20e0f4878fa16787bd50fcd82fb365be7 (patch) | |
| tree | 1761471976beb97edab677ab211326b62a2809ad /include/linux | |
| parent | fc92f745f8d0d3736ce5afb00a905d7cc61f9c46 (diff) | |
| parent | 2adb956b084d6d49f519541a4b5f9947e96f8ef7 (diff) | |
Merge branch 'vlan_offloads'
Vlad Yasevich says:
====================
Audit all drivers for correct vlan_features.
Some drivers set vlan acceleration features in vlan_features. This causes
issues with Q-in-Q/802.1ad configurations.
Audit all the drivers for correct vlan_features. Fix broken ones.
Add a warning to vlan code to help catch future offenders.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdev_features.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h index 1005ebf17575..5a09a48f2658 100644 --- a/include/linux/netdev_features.h +++ b/include/linux/netdev_features.h @@ -163,4 +163,11 @@ enum { /* changeable features with no special hardware requirements */ #define NETIF_F_SOFT_FEATURES (NETIF_F_GSO | NETIF_F_GRO) +#define NETIF_F_VLAN_FEATURES (NETIF_F_HW_VLAN_CTAG_FILTER | \ + NETIF_F_HW_VLAN_CTAG_RX | \ + NETIF_F_HW_VLAN_CTAG_TX | \ + NETIF_F_HW_VLAN_STAG_FILTER | \ + NETIF_F_HW_VLAN_STAG_RX | \ + NETIF_F_HW_VLAN_STAG_TX) + #endif /* _LINUX_NETDEV_FEATURES_H */ |