diff options
| author |   Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2016-03-04 11:52:16 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-03-04 16:10:36 -0500 |
| commit | b5d3755a22e0cc4c369c0985aef0c52c2477c1e7 (patch) | |
| tree | 2fef71a2d85dde83950727068fd890a4f10c8be6 /include/uapi/linux/ethtool.h | |
| parent | nfp: remove Rolf Neugebauer as co-maintainer (diff) | |
| download | linux-dev-b5d3755a22e0cc4c369c0985aef0c52c2477c1e7.tar.xz linux-dev-b5d3755a22e0cc4c369c0985aef0c52c2477c1e7.zip | |
uapi: define DIV_ROUND_UP for userland
DIV_ROUND_UP is defined in linux/kernel.h only for the kernel.
When ethtool.h is included by a userland app, we got the following error:
include/linux/ethtool.h:1218:8: error: variably modified 'queue_mask' at file scope
__u32 queue_mask[DIV_ROUND_UP(MAX_NUM_QUEUE, 32)];
^
Let's add a common definition in uapi and use it everywhere.
Fixes: ac2c7ad0e5d6 ("net/ethtool: introduce a new ioctl for per queue setting")
CC: Kan Liang <kan.liang@intel.com>
Suggested-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux/ethtool.h')
| -rw-r--r-- | include/uapi/linux/ethtool.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h index 37fd6dc33de4..9c22249ebf35 100644 --- a/include/uapi/linux/ethtool.h +++ b/include/uapi/linux/ethtool.h @@ -13,6 +13,7 @@ #ifndef _UAPI_LINUX_ETHTOOL_H #define _UAPI_LINUX_ETHTOOL_H +#include <linux/kernel.h> #include <linux/types.h> #include <linux/if_ether.h> @@ -1215,7 +1216,7 @@ enum ethtool_sfeatures_retval_bits { struct ethtool_per_queue_op { __u32 cmd; __u32 sub_command; - __u32 queue_mask[DIV_ROUND_UP(MAX_NUM_QUEUE, 32)]; + __u32 queue_mask[__KERNEL_DIV_ROUND_UP(MAX_NUM_QUEUE, 32)]; char data[]; }; |