| Message ID | 1456850464-23003-2-git-send-email-nicolas.dichtel@6wind.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Nicolas Dichtel <nicolas.dichtel@6wind.com> Date: Tue, 1 Mar 2016 17:41:04 +0100 > INT_MAX needs limits.h in userland. > When ethtool.h is included by a userland app, we got the following error: > > .../usr/include/linux/ethtool.h: In function 'ethtool_validate_speed': > .../usr/include/linux/ethtool.h:1471:18: error: 'INT_MAX' undeclared (first use in this function) > return speed <= INT_MAX || speed == SPEED_UNKNOWN > ^ > > Fixes: e02564ee334a ("ethtool: make validate_speed accept all speeds between 0 and INT_MAX") > CC: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Applied.
diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h index 9c22249ebf35..2835b07416b7 100644 --- a/include/uapi/linux/ethtool.h +++ b/include/uapi/linux/ethtool.h @@ -17,6 +17,10 @@ #include <linux/types.h> #include <linux/if_ether.h> +#ifndef __KERNEL__ +#include <limits.h> /* for INT_MAX */ +#endif + /* All structures exposed to userland should be defined such that they * have the same layout for 32-bit and 64-bit userland. */
INT_MAX needs limits.h in userland. When ethtool.h is included by a userland app, we got the following error: .../usr/include/linux/ethtool.h: In function 'ethtool_validate_speed': .../usr/include/linux/ethtool.h:1471:18: error: 'INT_MAX' undeclared (first use in this function) return speed <= INT_MAX || speed == SPEED_UNKNOWN ^ Fixes: e02564ee334a ("ethtool: make validate_speed accept all speeds between 0 and INT_MAX") CC: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- v2: split the patch define DIV_ROUND_UP in uapi include/uapi/linux/ethtool.h | 4 ++++ 1 file changed, 4 insertions(+)