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/ibm | |
| 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/ibm')
| -rw-r--r-- | drivers/net/ethernet/ibm/ehea/ehea_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c index 029633434474..9c9fa745ff82 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c | |||
| @@ -3021,11 +3021,11 @@ static struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter, | |||
| 3021 | ehea_set_ethtool_ops(dev); | 3021 | ehea_set_ethtool_ops(dev); |
| 3022 | 3022 | ||
| 3023 | dev->hw_features = NETIF_F_SG | NETIF_F_TSO | 3023 | dev->hw_features = NETIF_F_SG | NETIF_F_TSO |
| 3024 | | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX; | 3024 | | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_CTAG_TX; |
| 3025 | dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO | 3025 | dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO |
| 3026 | | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX | 3026 | | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | |
| 3027 | | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER | 3027 | | NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX | |
| 3028 | | NETIF_F_RXCSUM; | 3028 | | NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_RXCSUM; |
| 3029 | dev->vlan_features = NETIF_F_SG | NETIF_F_TSO | NETIF_F_HIGHDMA | | 3029 | dev->vlan_features = NETIF_F_SG | NETIF_F_TSO | NETIF_F_HIGHDMA | |
| 3030 | NETIF_F_IP_CSUM; | 3030 | NETIF_F_IP_CSUM; |
| 3031 | dev->watchdog_timeo = EHEA_WATCH_DOG_TIMEOUT; | 3031 | dev->watchdog_timeo = EHEA_WATCH_DOG_TIMEOUT; |