Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1247404
| From | Mikko Rapeli <mikko.rapeli@iki.fi> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v4 45/79] linux/if.h linux/hdlc/ioctl.h: move IFNAMSIZ definition to hdlc/ioctl.h |
| Date | 2015-10-15 08:00 +0200 |
| Message-ID | <qjJK2-5GL-13@gated-at.bofh.it> (permalink) |
| References | <qjJK1-5GL-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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 <fransklaver@gmail.com> on lkml message <20150530195223.GA15645@bugger.home>. Signed-off-by: Mikko Rapeli <mikko.rapeli@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-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
[PATCH v4 45/79] linux/if.h linux/hdlc/ioctl.h: move IFNAMSIZ definition to hdlc/ioctl.h Mikko Rapeli <mikko.rapeli@iki.fi> - 2015-10-15 08:00 +0200
Re: [PATCH v4 45/79] linux/if.h linux/hdlc/ioctl.h: move IFNAMSIZ definition to hdlc/ioctl.h Frans Klaver <fransklaver@gmail.com> - 2015-10-15 10:50 +0200
Re: [PATCH v4 45/79] linux/if.h linux/hdlc/ioctl.h: move IFNAMSIZ definition to hdlc/ioctl.h Mikko Rapeli <mikko.rapeli@iki.fi> - 2015-10-15 20:10 +0200
[PATCH] linux/if.h linux/hdlc/ioctl.h: move IFNAMSIZ definition to hdlc/ioctl.h Mikko Rapeli <mikko.rapeli@iki.fi> - 2015-10-15 20:20 +0200
csiph-web