From: Florian Fainelli Date: Fri, 27 Apr 2018 20:11:14 +0000 (-0700) Subject: net: core: Assert the size of netdev_featres_t X-Git-Tag: v4.18-rc1~114^2~348 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ac305c386f698abccd0523c64a8aef248c89bc6;p=thirdparty%2Fkernel%2Flinux.git net: core: Assert the size of netdev_featres_t We have about 53 netdev_features_t bits defined and counting, add a build time check to catch when an u64 type will not be enough and we will have to convert that to a bitmap. This is done in register_netdevice() for convenience. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller --- diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 82f5a9aba5780..9e09dd897b749 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -4108,6 +4108,12 @@ 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) { diff --git a/net/core/dev.c b/net/core/dev.c index 25ceecfdd8fe1..e01c21a88cae0 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -7879,6 +7879,7 @@ int register_netdevice(struct net_device *dev) int ret; struct net *net = dev_net(dev); + netdev_features_size_check(); BUG_ON(dev_boot_phase); ASSERT_RTNL();