Skip to content

Commit 6849fe5

Browse files
committed
team: Fix initial vlan_feature set in __team_compute_features
jira LE-2974 Rebuild_History Non-Buildable kernel-5.14.0-503.40.1.el9_5 commit-author Daniel Borkmann <[email protected]> commit 396699a 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]> (cherry picked from commit 396699a) Signed-off-by: Jonathan Maple <[email protected]>
1 parent 41a378d commit 6849fe5

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/net/team/team_core.c

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

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

0 commit comments

Comments
 (0)