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 /net/openvswitch/vport-internal_dev.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 'net/openvswitch/vport-internal_dev.c')
-rw-r--r-- | net/openvswitch/vport-internal_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c index 9604760494b1..73682de8dc69 100644 --- a/net/openvswitch/vport-internal_dev.c +++ b/net/openvswitch/vport-internal_dev.c | |||
@@ -137,7 +137,7 @@ static void do_setup(struct net_device *netdev) | |||
137 | NETIF_F_HIGHDMA | NETIF_F_HW_CSUM | NETIF_F_TSO; | 137 | NETIF_F_HIGHDMA | NETIF_F_HW_CSUM | NETIF_F_TSO; |
138 | 138 | ||
139 | netdev->vlan_features = netdev->features; | 139 | netdev->vlan_features = netdev->features; |
140 | netdev->features |= NETIF_F_HW_VLAN_TX; | 140 | netdev->features |= NETIF_F_HW_VLAN_CTAG_TX; |
141 | netdev->hw_features = netdev->features & ~NETIF_F_LLTX; | 141 | netdev->hw_features = netdev->features & ~NETIF_F_LLTX; |
142 | eth_hw_addr_random(netdev); | 142 | eth_hw_addr_random(netdev); |
143 | } | 143 | } |