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/mellanox | |
| 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/mellanox')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index d2a4f919bf1f..b2ba39c7143a 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c | |||
| @@ -2082,8 +2082,8 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, | |||
| 2082 | 2082 | ||
| 2083 | dev->hw_features |= NETIF_F_RXCSUM | NETIF_F_RXHASH; | 2083 | dev->hw_features |= NETIF_F_RXCSUM | NETIF_F_RXHASH; |
| 2084 | dev->features = dev->hw_features | NETIF_F_HIGHDMA | | 2084 | dev->features = dev->hw_features | NETIF_F_HIGHDMA | |
| 2085 | NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX | | 2085 | NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX | |
| 2086 | NETIF_F_HW_VLAN_FILTER; | 2086 | NETIF_F_HW_VLAN_CTAG_FILTER; |
| 2087 | dev->hw_features |= NETIF_F_LOOPBACK; | 2087 | dev->hw_features |= NETIF_F_LOOPBACK; |
| 2088 | 2088 | ||
| 2089 | if (mdev->dev->caps.steering_mode == | 2089 | if (mdev->dev->caps.steering_mode == |