summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYueHaibing <yuehaibing@huawei.com>2019-08-08 14:22:47 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-08-25 10:51:52 +0200
commita4cb8ca3e951a24e850f7074d93305f39f67464e (patch)
tree10317a781d47759874f957fdc0f853a95914d6d1
parent4aa2734ced922da3ffa5f4a93473a21c98466c1b (diff)
downloadlinux-stable-a4cb8ca3e951a24e850f7074d93305f39f67464e.tar.gz
linux-stable-a4cb8ca3e951a24e850f7074d93305f39f67464e.tar.bz2
linux-stable-a4cb8ca3e951a24e850f7074d93305f39f67464e.zip
team: Add vlan tx offload to hw_enc_features
[ Upstream commit 227f2f030e28d8783c3d10ce70ff4ba79cad653f ] We should also enable team's vlan tx offload in hw_enc_features, pass the vlan packets to the slave devices with vlan tci, let the slave handle vlan tunneling offload implementation. Fixes: 3268e5cb494d ("team: Advertise tunneling offload features") Signed-off-by: YueHaibing <yuehaibing@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/team/team.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 0acdf73aa1b0..fd2573cca803 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -1014,7 +1014,9 @@ static void ___team_compute_features(struct team *team)
}
team->dev->vlan_features = vlan_features;
- team->dev->hw_enc_features = enc_features | NETIF_F_GSO_ENCAP_ALL;
+ team->dev->hw_enc_features = enc_features | NETIF_F_GSO_ENCAP_ALL |
+ NETIF_F_HW_VLAN_CTAG_TX |
+ NETIF_F_HW_VLAN_STAG_TX;
team->dev->hard_header_len = max_hard_header_len;
team->dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;