And include linux/hdlc/ioctl.h from linux/if.h. Fixes userspace compiler error:
error: ‘IFNAMSIZ’ undeclared here (not in a function) Suggested by Frans Klaver <franskla...@gmail.com> on lkml message <20150530195223.ga15...@bugger.home>. Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi> --- include/uapi/linux/hdlc/ioctl.h | 1 + include/uapi/linux/if.h | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/uapi/linux/hdlc/ioctl.h b/include/uapi/linux/hdlc/ioctl.h index 04bc027..d1b1de5 100644 --- a/include/uapi/linux/hdlc/ioctl.h +++ b/include/uapi/linux/hdlc/ioctl.h @@ -1,6 +1,7 @@ #ifndef __HDLC_IOCTL_H__ #define __HDLC_IOCTL_H__ +#define IFNAMSIZ 16 #define GENERIC_HDLC_VERSION 4 /* For synchronization with sethdlc utility */ diff --git a/include/uapi/linux/if.h b/include/uapi/linux/if.h index 9cf2394..0f98f0a 100644 --- a/include/uapi/linux/if.h +++ b/include/uapi/linux/if.h @@ -22,10 +22,8 @@ #include <linux/types.h> /* for "__kernel_caddr_t" et al */ #include <linux/socket.h> /* for "struct sockaddr" et al */ #include <linux/compiler.h> /* for "__user" et al */ - -#define IFNAMSIZ 16 -#define IFALIASZ 256 -#include <linux/hdlc/ioctl.h> +#include <linux/hdlc/ioctl.h> /* for IFNAMSIZ */ +#define IFALIASZ 256 /** * enum net_device_flags - &struct net_device flags -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
