| Message ID | 20241210141245.327886-4-daniel@iogearbox.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 396699ac2cb1bc4e3485abb48a1e3e41956de0cd |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,1/5] net, team, bonding: Add netdev_base_features helper | expand |
On 12/10/24 16:12, Daniel Borkmann wrote: > 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> > --- > drivers/net/team/team_core.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/team/team_core.c b/drivers/net/team/team_core.c > index 1df062c67640..306416fc1db0 100644 > --- 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, Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org>
On Tue, Dec 10, 2024 at 03:12:44PM +0100, Daniel Borkmann wrote: > 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> > --- > drivers/net/team/team_core.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/team/team_core.c b/drivers/net/team/team_core.c > index 1df062c67640..306416fc1db0 100644 > --- 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, > -- > 2.43.0 > Reviewed-by: Hangbin Liu <liuhangbin@gmail.com>
diff --git a/drivers/net/team/team_core.c b/drivers/net/team/team_core.c index 1df062c67640..306416fc1db0 100644 --- 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,
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> --- drivers/net/team/team_core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)