Skip to contentSkip to conversation

net: core: Inline netdev_features_size_check()

PATCH In review Florian Fainelli 2 participants 2 messages Apr 30, 2018 – May 1, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: core: Inline netdev_features_size_check()

We do not require this inline function to be used in multiple different locations, just inline it where it gets used in register_netdevice().

---
 include/linux/netdevice.h | 6 ------
 net/core/dev.c            | 3 ++-
 2 files changed, 2 insertions(+), 7 deletions(-)
include/linux/netdevice.h +0 -6
index 9e09dd897b74..82f5a9aba578 100644
@@ -4108,12 +4108,6 @@ const char *netdev_drivername(const struct net_device *dev);
 
 void linkwatch_run_queue(void);
 
-static inline void netdev_features_size_check(void)
-{
-	BUILD_BUG_ON(sizeof(netdev_features_t) * BITS_PER_BYTE <
-		     NETDEV_FEATURE_COUNT);
-}
-
 static inline netdev_features_t netdev_intersect_features(netdev_features_t f1,
 							  netdev_features_t f2)
 {
net/core/dev.c +2 -1
index e01c21a88cae..3263c14c607f 100644
@@ -7879,7 +7879,8 @@ int register_netdevice(struct net_device *dev)
 	int ret;
 	struct net *net = dev_net(dev);
 
-	netdev_features_size_check();
+	BUILD_BUG_ON(sizeof(netdev_features_t) * BITS_PER_BYTE <
+		     NETDEV_FEATURE_COUNT);
 	BUG_ON(dev_boot_phase);
 	ASSERT_RTNL();
 
Signature · 1 line
2.14.1