For the origin type for netdev_features_t would be changed to
be unsigned long * from u64, so changes the prototype of
netdev_add_tso_features for adaption.
Signed-off-by: Jian Shen <shenjian15@huawei.com>
---
drivers/net/bonding/bond_main.c | 2 +-
drivers/net/team/team.c | 2 +-
include/linux/netdevice.h | 6 +++---
net/bridge/br_if.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 469509260a51..878c92746ada 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1386,7 +1386,7 @@ static void bond_fix_features(struct net_device *dev,
slave->dev->features,
mask);
}
- *features = netdev_add_tso_features(*features, mask);
+ netdev_add_tso_features(features, mask);
}
#define BOND_VLAN_FEATURES (NETIF_F_HW_CSUM | NETIF_F_SG | \
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 340be925d4eb..706572b7a313 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -2014,7 +2014,7 @@ static void team_fix_features(struct net_device *dev,
}
rcu_read_unlock();
- *features = netdev_add_tso_features(*features, mask);
+ netdev_add_tso_features(features, mask);
}
static int team_change_carrier(struct net_device *dev, bool new_carrier)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 43eb57fa9434..e826435ab847 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -5043,10 +5043,10 @@ netdev_features_t netdev_increment_features(netdev_features_t all,
* Performing the GSO segmentation before last device
* is a performance improvement.
*/
-static inline netdev_features_t netdev_add_tso_features(netdev_features_t features,
- netdev_features_t mask)
+static inline void netdev_add_tso_features(netdev_features_t *features,
+ netdev_features_t mask)
{
- return netdev_increment_features(features, NETIF_F_ALL_TSO, mask);
+ *features = netdev_increment_features(*features, NETIF_F_ALL_TSO, mask);
}
int __netdev_update_features(struct net_device *dev);diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index b2afbea2133e..749971ab1088 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -547,7 +547,7 @@ void br_features_recompute(struct net_bridge *br, netdev_features_t *features)
*features = netdev_increment_features(*features,
p->dev->features, mask);
}
- *features = netdev_add_tso_features(*features, mask);
+ netdev_add_tso_features(features, mask);
}
/* called with RTNL */
--
2.33.0