Commit 396699ac authored by Daniel Borkmann's avatar Daniel Borkmann Committed by Paolo Abeni
Browse files

team: Fix initial vlan_feature set in __team_compute_features 



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: 3625920b ("teaming: fix vlan_features computing")
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Cc: Nikolay Aleksandrov <razor@blackwall.org>
Cc: Ido Schimmel <idosch@idosch.org>
Cc: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Reviewed-by: default avatarHangbin Liu <liuhangbin@gmail.com>
Link: https://patch.msgid.link/20241210141245.327886-4-daniel@iogearbox.net


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 77b11c8b

drivers/net/team/team_core.c

+3 −2
Original line number Diff line number Diff line
@@ -991,13 +991,14 @@ static void team_port_disable(struct team *team, 
static void __team_compute_features(struct team *team)

{

	struct team_port *port;

	netdev_features_t vlan_features = TEAM_VLAN_FEATURES &

					  NETIF_F_ALL_FOR_ALL;

	netdev_features_t vlan_features = TEAM_VLAN_FEATURES;

	netdev_features_t enc_features  = TEAM_ENC_FEATURES;

	unsigned short max_hard_header_len = ETH_HLEN;

	unsigned int dst_release_flag = IFF_XMIT_DST_RELEASE |

					IFF_XMIT_DST_RELEASE_PERM;



	vlan_features = netdev_base_features(vlan_features);



	rcu_read_lock();

	list_for_each_entry_rcu(port, &team->port_list, list) {

		vlan_features = netdev_increment_features(vlan_features,