diff options
| author | Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp> | 2014-06-10 20:59:22 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-11 15:22:53 -0700 |
| commit | 1c5abb6c77a2e79537373143d2c1708e40b9f6ca (patch) | |
| tree | f9e7dd2d3e84729b64f92acd8b1f29b760bbb13e /net | |
| parent | e7b599d7c1dbdcdb9d4228ec9d3934c139592ba3 (diff) | |
| download | linux-stable-1c5abb6c77a2e79537373143d2c1708e40b9f6ca.tar.gz linux-stable-1c5abb6c77a2e79537373143d2c1708e40b9f6ca.tar.bz2 linux-stable-1c5abb6c77a2e79537373143d2c1708e40b9f6ca.zip | |
bridge: Add 802.1ad tx vlan acceleration
Bridge device doesn't need to embed S-tag into skb->data.
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bridge/br_device.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index d77e2f0ff0e9..82a410a5ef7e 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -361,8 +361,9 @@ void br_dev_setup(struct net_device *dev) dev->priv_flags = IFF_EBRIDGE; dev->features = COMMON_FEATURES | NETIF_F_LLTX | NETIF_F_NETNS_LOCAL | - NETIF_F_HW_VLAN_CTAG_TX; - dev->hw_features = COMMON_FEATURES | NETIF_F_HW_VLAN_CTAG_TX; + NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX; + dev->hw_features = COMMON_FEATURES | NETIF_F_HW_VLAN_CTAG_TX | + NETIF_F_HW_VLAN_STAG_TX; dev->vlan_features = COMMON_FEATURES; br->dev = dev; |