diff options
author | Patrick McHardy <kaber@trash.net> | 2013-04-18 22:04:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-19 14:45:26 -0400 |
commit | f646968f8f7c624587de729115d802372b9063dd (patch) | |
tree | 2b8c6604306f5e74af9e16c17e2b611610982b65 /drivers/net/ethernet/brocade | |
parent | c2962897c94605bc8f158a37dee8d867dda9f116 (diff) |
net: vlan: rename NETIF_F_HW_VLAN_* feature flags to NETIF_F_HW_VLAN_CTAG_*
Rename the hardware VLAN acceleration features to include "CTAG" to indicate
that they only support CTAGs. Follow up patches will introduce 802.1ad
server provider tagging (STAGs) and require the distinction for hardware not
supporting acclerating both.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/brocade')
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bnad.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c index d588f842d557..1d9d0371a743 100644 --- a/drivers/net/ethernet/brocade/bna/bnad.c +++ b/drivers/net/ethernet/brocade/bna/bnad.c | |||
@@ -3170,14 +3170,14 @@ bnad_netdev_init(struct bnad *bnad, bool using_dac) | |||
3170 | 3170 | ||
3171 | netdev->hw_features = NETIF_F_SG | NETIF_F_RXCSUM | | 3171 | netdev->hw_features = NETIF_F_SG | NETIF_F_RXCSUM | |
3172 | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | | 3172 | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | |
3173 | NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_HW_VLAN_TX; | 3173 | NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_HW_VLAN_CTAG_TX; |
3174 | 3174 | ||
3175 | netdev->vlan_features = NETIF_F_SG | NETIF_F_HIGHDMA | | 3175 | netdev->vlan_features = NETIF_F_SG | NETIF_F_HIGHDMA | |
3176 | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | | 3176 | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | |
3177 | NETIF_F_TSO | NETIF_F_TSO6; | 3177 | NETIF_F_TSO | NETIF_F_TSO6; |
3178 | 3178 | ||
3179 | netdev->features |= netdev->hw_features | | 3179 | netdev->features |= netdev->hw_features | |
3180 | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER; | 3180 | NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_FILTER; |
3181 | 3181 | ||
3182 | if (using_dac) | 3182 | if (using_dac) |
3183 | netdev->features |= NETIF_F_HIGHDMA; | 3183 | netdev->features |= NETIF_F_HIGHDMA; |