Skip to content
This repository has been archived by the owner on Sep 24, 2020. It is now read-only.

Commit

Permalink
net: core: Inline netdev_features_size_check()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
ffainelli authored and davem330 committed May 1, 2018
1 parent a8c744a commit e283de3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
6 changes: 0 additions & 6 deletions include/linux/netdevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
3 changes: 2 additions & 1 deletion net/core/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down

0 comments on commit e283de3

Please sign in to comment.