[RFCv2,net-next,008/167] net: convert the prototype of dflt_features_check

Commit Message

shenjian (K) Sept. 29, 2021, 3:50 p.m. UTC

For the origin type for netdev_features_t would be changed to
be unsigned long * from u64, so changes the prototype of
dflt_features_check for adaption.

Signed-off-by: Jian Shen <[e-mail]>
---
 net/core/dev.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

Patch

diff --git a/net/core/dev.c b/net/core/dev.c
index 85d894e06f4e..814e6e7ee579 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3480,12 +3480,11 @@  netdev_features_t passthru_features_check(struct sk_buff *skb,
 }
 EXPORT_SYMBOL(passthru_features_check);
 
-static netdev_features_t dflt_features_check(struct sk_buff *skb,
-					     struct net_device *dev,
-					     netdev_features_t features)
+static void dflt_features_check(struct sk_buff *skb,
+				struct net_device *dev,
+				netdev_features_t *features)
 {
-	vlan_features_check(skb, &features);
-	return features;
+	vlan_features_check(skb, features);
 }
 
 static void gso_features_check(const struct sk_buff *skb,
@@ -3551,7 +3550,7 @@  netdev_features_t netif_skb_features(struct sk_buff *skb)
 		features &= dev->netdev_ops->ndo_features_check(skb, dev,
 								features);
 	else
-		features &= dflt_features_check(skb, dev, features);
+		dflt_features_check(skb, dev, &features);
 
 	harmonize_features(skb, &features);
 	return features;