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/toshiba/spider_net.c | |
| 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/toshiba/spider_net.c')
| -rw-r--r-- | drivers/net/ethernet/toshiba/spider_net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/toshiba/spider_net.c b/drivers/net/ethernet/toshiba/spider_net.c index fef6b59e69c9..c655fe60121e 100644 --- a/drivers/net/ethernet/toshiba/spider_net.c +++ b/drivers/net/ethernet/toshiba/spider_net.c | |||
| @@ -2329,8 +2329,8 @@ spider_net_setup_netdev(struct spider_net_card *card) | |||
| 2329 | if (SPIDER_NET_RX_CSUM_DEFAULT) | 2329 | if (SPIDER_NET_RX_CSUM_DEFAULT) |
| 2330 | netdev->features |= NETIF_F_RXCSUM; | 2330 | netdev->features |= NETIF_F_RXCSUM; |
| 2331 | netdev->features |= NETIF_F_IP_CSUM | NETIF_F_LLTX; | 2331 | netdev->features |= NETIF_F_IP_CSUM | NETIF_F_LLTX; |
| 2332 | /* some time: NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX | | 2332 | /* some time: NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX | |
| 2333 | * NETIF_F_HW_VLAN_FILTER */ | 2333 | * NETIF_F_HW_VLAN_CTAG_FILTER */ |
| 2334 | 2334 | ||
| 2335 | netdev->irq = card->pdev->irq; | 2335 | netdev->irq = card->pdev->irq; |
| 2336 | card->num_rx_ints = 0; | 2336 | card->num_rx_ints = 0; |