Skip to content

Commit d2516c3

Browse files
borkmannPaolo Abeni
authored andcommitted
net, team, bonding: Add netdev_base_features helper
Both bonding and team driver have logic to derive the base feature flags before iterating over their slave devices to refine the set via netdev_increment_features(). Add a small helper netdev_base_features() so this can be reused instead of having it open-coded multiple times. 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: Hangbin Liu <liuhangbin@gmail.com> Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org> Link: https://patch.msgid.link/20241210141245.327886-1-daniel@iogearbox.net Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent f8d4bc4 commit d2516c3

3 files changed

Lines changed: 9 additions & 5 deletions

File tree

drivers/net/bonding/bond_main.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1520,9 +1520,7 @@ static netdev_features_t bond_fix_features(struct net_device *dev,
15201520
struct slave *slave;
15211521

15221522
mask = features;
1523-
1524-
features &= ~NETIF_F_ONE_FOR_ALL;
1525-
features |= NETIF_F_ALL_FOR_ALL;
1523+
features = netdev_base_features(features);
15261524

15271525
bond_for_each_slave(bond, slave, iter) {
15281526
features = netdev_increment_features(features,

drivers/net/team/team_core.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2011,8 +2011,7 @@ static netdev_features_t team_fix_features(struct net_device *dev,
20112011
netdev_features_t mask;
20122012

20132013
mask = features;
2014-
features &= ~NETIF_F_ONE_FOR_ALL;
2015-
features |= NETIF_F_ALL_FOR_ALL;
2014+
features = netdev_base_features(features);
20162015

20172016
rcu_read_lock();
20182017
list_for_each_entry_rcu(port, &team->port_list, list) {

include/linux/netdev_features.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,4 +253,11 @@ static inline int find_next_netdev_feature(u64 feature, unsigned long start)
253253
NETIF_F_GSO_UDP_TUNNEL | \
254254
NETIF_F_GSO_UDP_TUNNEL_CSUM)
255255

256+
static inline netdev_features_t netdev_base_features(netdev_features_t features)
257+
{
258+
features &= ~NETIF_F_ONE_FOR_ALL;
259+
features |= NETIF_F_ALL_FOR_ALL;
260+
return features;
261+
}
262+
256263
#endif /* _LINUX_NETDEV_FEATURES_H */

0 commit comments

Comments
 (0)