Skip to content

Commit 762e226

Browse files
borkmannmehmetb0
authored andcommitted
team: Fix initial vlan_feature set in __team_compute_features
BugLink: https://bugs.launchpad.net/bugs/2102181 [ Upstream commit 396699ac2cb1bc4e3485abb48a1e3e41956de0cd ] Similarly as with bonding, fix the calculation of vlan_features to reuse netdev_base_features() in order derive the set in the same way as ndo_fix_features before iterating through the slave devices to refine the feature set. Fixes: 3625920 ("teaming: fix vlan_features computing") Signed-off-by: Daniel Borkmann <[email protected]> Cc: Nikolay Aleksandrov <[email protected]> Cc: Ido Schimmel <[email protected]> Cc: Jiri Pirko <[email protected]> Reviewed-by: Nikolay Aleksandrov <[email protected]> Reviewed-by: Hangbin Liu <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Paolo Abeni <[email protected]> Signed-off-by: Sasha Levin <[email protected]> [koichiroden: applied to an older path due to missing commit: a0393e3e3ddb ("net: team: rename team to team_core for linking")] Signed-off-by: Koichiro Den <[email protected]> Signed-off-by: Mehmet Basaran <[email protected]>
1 parent 7cc09b8 commit 762e226

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/net/team/team.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -991,13 +991,14 @@ static void team_port_disable(struct team *team,
991991
static void __team_compute_features(struct team *team)
992992
{
993993
struct team_port *port;
994-
netdev_features_t vlan_features = TEAM_VLAN_FEATURES &
995-
NETIF_F_ALL_FOR_ALL;
994+
netdev_features_t vlan_features = TEAM_VLAN_FEATURES;
996995
netdev_features_t enc_features = TEAM_ENC_FEATURES;
997996
unsigned short max_hard_header_len = ETH_HLEN;
998997
unsigned int dst_release_flag = IFF_XMIT_DST_RELEASE |
999998
IFF_XMIT_DST_RELEASE_PERM;
1000999

1000+
vlan_features = netdev_base_features(vlan_features);
1001+
10011002
rcu_read_lock();
10021003
list_for_each_entry_rcu(port, &team->port_list, list) {
10031004
vlan_features = netdev_increment_features(vlan_features,

0 commit comments

Comments
 (0)