Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e283de3a authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

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: default avatarDavid Miller <davem@davemloft.net>
Suggested-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a8c744a8

include/linux/netdevice.h

+0 −6
Original line number Diff line number Diff line
@@ -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)

{

net/core/dev.c

+2 −1
Original line number Diff line number Diff line
@@ -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();