| Message ID | 20190626160339.35152-1-yuehaibing@huawei.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | team: Always enable vlan tx offload | expand |
From: YueHaibing <yuehaibing@huawei.com> Date: Thu, 27 Jun 2019 00:03:39 +0800 > 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> Applied and queued up for -stable, thanks.
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index b48006e7fa2f..a8bb25341bed 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) dev->features |= NETIF_F_NETNS_LOCAL; dev->hw_features = TEAM_VLAN_FEATURES | - NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_FILTER; dev->hw_features |= NETIF_F_GSO_ENCAP_ALL | NETIF_F_GSO_UDP_L4; dev->features |= dev->hw_features; + dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX; } static int team_newlink(struct net *src_net, struct net_device *dev,
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> --- drivers/net/team/team.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)