]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
net: core: Inline netdev_features_size_check()
authorFlorian Fainelli <f.fainelli@gmail.com>
Mon, 30 Apr 2018 21:20:05 +0000 (14:20 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 1 May 2018 18:24:19 +0000 (14:24 -0400)
We do not require this inline function to be used in multiple different
locations, just inline it where it gets used in register_netdevice().

Suggested-by: David Miller <davem@davemloft.net>
Suggested-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/netdevice.h
net/core/dev.c

index a569bf5524fa42607cf744f1da73b24c1dc6a3f4..46dcb5f7522f217ae58ba04c391d1cc4a1421eb5 100644 (file)
@@ -4132,12 +4132,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)
 {
index 8944e1e0059d83c10bb9cd007ca6a5baeb7d0dc7..bb81a6e1d35498b7b404e40f1aacec694760116b 100644 (file)
@@ -7883,7 +7883,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();