redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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().

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>
hifive-unleashed-5.1
Florian Fainelli 2018-04-30 14:20:05 -07:00 committed by David S. Miller
parent a8c744a8b4
commit e283de3a4f
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/netdevice.h
View 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)
{

3
net/core/dev.c
View 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();