You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
33 lines
1.3 KiB
33 lines
1.3 KiB
From 1b9ae0c92925ac40489be526d67d0010d0724ce0 Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Date: Thu, 21 May 2020 22:14:22 +0200
|
|
Subject: [PATCH] wireless: Use linux/stddef.h instead of stddef.h
|
|
|
|
When compiling inside the kernel include linux/stddef.h instead of
|
|
stddef.h. When I compile this header file in backports for power PC I
|
|
run into a conflict with ptrdiff_t. I was unable to reproduce this in
|
|
mainline kernel. I still would like to fix this problem in the kernel.
|
|
|
|
Fixes: 6989310f5d43 ("wireless: Use offsetof instead of custom macro.")
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Link: https://lore.kernel.org/r/20200521201422.16493-1-hauke@hauke-m.de
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
---
|
|
include/uapi/linux/wireless.h | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
--- a/include/uapi/linux/wireless.h
|
|
+++ b/include/uapi/linux/wireless.h
|
|
@@ -74,7 +74,11 @@
|
|
#include <linux/socket.h> /* for "struct sockaddr" et al */
|
|
#include <linux/if.h> /* for IFNAMSIZ and co... */
|
|
|
|
-#include <stddef.h> /* for offsetof */
|
|
+#ifdef __KERNEL__
|
|
+# include <linux/stddef.h> /* for offsetof */
|
|
+#else
|
|
+# include <stddef.h> /* for offsetof */
|
|
+#endif
|
|
|
|
/***************************** VERSION *****************************/
|
|
/*
|
|
|