aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYueHaibing <yuehaibing@huawei.com>2019-06-26 12:03:39 -0400
committerDavid S. Miller <davem@davemloft.net>2019-06-26 13:14:08 -0400
commitee4297420d56a0033a8593e80b33fcc93fda8509 (patch)
tree2185a97e07b8d02515820b5709f55f3d2e80a93f
parent8a53058bd9bae9a4381209a8122c60ac346622ef (diff)
team: Always enable vlan tx offload
We should rather have vlan_tci filled all the way down to the transmitting netdevice and let it do the hw/sw vlan implementation. Suggested-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: YueHaibing <yuehaibing@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/team/team.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index b48006e7fa2f..36916bf51ee6 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -2128,12 +2128,12 @@ static void team_setup(struct net_device *dev)
2128 dev->features |= NETIF_F_NETNS_LOCAL; 2128 dev->features |= NETIF_F_NETNS_LOCAL;
2129 2129
2130 dev->hw_features = TEAM_VLAN_FEATURES | 2130 dev->hw_features = TEAM_VLAN_FEATURES |
2131 NETIF_F_HW_VLAN_CTAG_TX |
2132 NETIF_F_HW_VLAN_CTAG_RX | 2131 NETIF_F_HW_VLAN_CTAG_RX |
2133 NETIF_F_HW_VLAN_CTAG_FILTER; 2132 NETIF_F_HW_VLAN_CTAG_FILTER;
2134 2133
2135 dev->hw_features |= NETIF_F_GSO_ENCAP_ALL | NETIF_F_GSO_UDP_L4; 2134 dev->hw_features |= NETIF_F_GSO_ENCAP_ALL | NETIF_F_GSO_UDP_L4;
2136 dev->features |= dev->hw_features; 2135 dev->features |= dev->hw_features;
2136 dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX;
2137} 2137}
2138 2138
2139static int team_newlink(struct net *src_net, struct net_device *dev, 2139static int team_newlink(struct net *src_net, struct net_device *dev,