From: Kirill A. Shutemov <kirill@xxxxxxxxxxxxx> This patch partially reverts commit 2218228392080f0ca2fc2974604e79f57b12c436 ("Make linux/wireless.h be able to compile") while still making it easier to include wireless.h in userland apps. Signed-off-by: Kirill A. Shutemov <kirill@xxxxxxxxxxxxx> Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx> --- include/linux/wireless.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/linux/wireless.h b/include/linux/wireless.h index 0a9b5b4..9c0b89c 100644 --- a/include/linux/wireless.h +++ b/include/linux/wireless.h @@ -70,8 +70,14 @@ /***************************** INCLUDES *****************************/ #include <linux/types.h> /* for __u* and __s* typedefs */ + +/* This header is used in user-space, therefore need to be sanitised + * for that purpose. Those includes are usually not compatible with glibc. + * To know which includes to use in user-space, check iwlib.h. */ +#ifdef __KERNEL__ #include <linux/socket.h> /* for "struct sockaddr" et al */ #include <linux/if.h> /* for IFNAMSIZ and co... */ +#endif /* __KERNEL__ */ /***************************** VERSION *****************************/ /* -- 1.5.5.1 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html