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/broadcom/bnx2x | |
| 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/broadcom/bnx2x')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index fdfe33bc097b..1e60c5d139d1 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | |||
| @@ -12027,7 +12027,7 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev, | |||
| 12027 | dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | | 12027 | dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | |
| 12028 | NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6 | | 12028 | NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6 | |
| 12029 | NETIF_F_RXCSUM | NETIF_F_LRO | NETIF_F_GRO | | 12029 | NETIF_F_RXCSUM | NETIF_F_LRO | NETIF_F_GRO | |
| 12030 | NETIF_F_RXHASH | NETIF_F_HW_VLAN_TX; | 12030 | NETIF_F_RXHASH | NETIF_F_HW_VLAN_CTAG_TX; |
| 12031 | if (!CHIP_IS_E1x(bp)) { | 12031 | if (!CHIP_IS_E1x(bp)) { |
| 12032 | dev->hw_features |= NETIF_F_GSO_GRE; | 12032 | dev->hw_features |= NETIF_F_GSO_GRE; |
| 12033 | dev->hw_enc_features = | 12033 | dev->hw_enc_features = |
| @@ -12039,7 +12039,7 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev, | |||
| 12039 | dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | | 12039 | dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | |
| 12040 | NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_HIGHDMA; | 12040 | NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_HIGHDMA; |
| 12041 | 12041 | ||
| 12042 | dev->features |= dev->hw_features | NETIF_F_HW_VLAN_RX; | 12042 | dev->features |= dev->hw_features | NETIF_F_HW_VLAN_CTAG_RX; |
| 12043 | if (bp->flags & USING_DAC_FLAG) | 12043 | if (bp->flags & USING_DAC_FLAG) |
| 12044 | dev->features |= NETIF_F_HIGHDMA; | 12044 | dev->features |= NETIF_F_HIGHDMA; |
| 12045 | 12045 | ||