team: Fix initial vlan_feature set in __team_compute_features

[ 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: 3625920b62c3 ("teaming: fix vlan_features computing")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Cc: Nikolay Aleksandrov <razor@blackwall.org>
Cc: Ido Schimmel <idosch@idosch.org>
Cc: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org>
Reviewed-by: Hangbin Liu <liuhangbin@gmail.com>
Link: https://patch.msgid.link/20241210141245.327886-4-daniel@iogearbox.net
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/team/team_core.c b/drivers/net/team/team_core.c
index 481c8df8842fb5f498eae5a83e7dcbc53c0afb31..ddd9ae7085c7d29561f0bb22bf61c9b519539d86 100644 (file)
--- a/drivers/net/team/team_core.c
+++ b/drivers/net/team/team_core.c
@@ -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,