diff options
| author | Patrick McHardy <kaber@trash.net> | 2013-04-19 02:04:32 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-19 14:46:06 -0400 |
| commit | 28d2b136ca6c7bf7173a43a90f747ecda5b0520d (patch) | |
| tree | 9e3d6af491b1a01b077b927e51d513134e67e1a5 | |
| parent | 8ad227ff89a7e6f05d07cd0acfd95ed3a24450ca (diff) | |
| download | linux-3.10-28d2b136ca6c7bf7173a43a90f747ecda5b0520d.tar.gz linux-3.10-28d2b136ca6c7bf7173a43a90f747ecda5b0520d.tar.bz2 linux-3.10-28d2b136ca6c7bf7173a43a90f747ecda5b0520d.zip | |
net: vlan: announce STAG offload capability in some drivers
- macvlan: propagate STAG filtering capabilities from underlying device
- ifb: announce STAG tagging support in addition to CTAG tagging support
- veth: announce STAG tagging/stripping support in addition to CTAG support
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ifb.c | 3 | ||||
| -rw-r--r-- | drivers/net/macvlan.c | 2 | ||||
| -rw-r--r-- | drivers/net/veth.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c index 724ce7a36c9..dc9f6a45515 100644 --- a/drivers/net/ifb.c +++ b/drivers/net/ifb.c @@ -166,7 +166,8 @@ static const struct net_device_ops ifb_netdev_ops = { #define IFB_FEATURES (NETIF_F_HW_CSUM | NETIF_F_SG | NETIF_F_FRAGLIST | \ NETIF_F_TSO_ECN | NETIF_F_TSO | NETIF_F_TSO6 | \ - NETIF_F_HIGHDMA | NETIF_F_HW_VLAN_CTAG_TX) + NETIF_F_HIGHDMA | NETIF_F_HW_VLAN_CTAG_TX | \ + NETIF_F_HW_VLAN_STAG_TX) static void ifb_setup(struct net_device *dev) { diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 7347cdbe736..d5a141c7c4e 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -471,7 +471,7 @@ static struct lock_class_key macvlan_netdev_addr_lock_key; (NETIF_F_SG | NETIF_F_ALL_CSUM | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \ NETIF_F_GSO | NETIF_F_TSO | NETIF_F_UFO | NETIF_F_GSO_ROBUST | \ NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_GRO | NETIF_F_RXCSUM | \ - NETIF_F_HW_VLAN_CTAG_FILTER) + NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_HW_VLAN_STAG_FILTER) #define MACVLAN_STATE_MASK \ ((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT)) diff --git a/drivers/net/veth.c b/drivers/net/veth.c index f116c593d87..177f911f594 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -255,7 +255,8 @@ static const struct net_device_ops veth_netdev_ops = { #define VETH_FEATURES (NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_ALL_TSO | \ NETIF_F_HW_CSUM | NETIF_F_RXCSUM | NETIF_F_HIGHDMA | \ - NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX) + NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX | \ + NETIF_F_HW_VLAN_STAG_TX | NETIF_F_HW_VLAN_STAG_RX ) static void veth_setup(struct net_device *dev) { |