5.4-stable patches

added patches:
	wireless-use-linux-stddef.h-instead-of-stddef.h.patch

diff --git a/queue-5.4/series b/queue-5.4/series
index fe8a9dbcfc9da34bca1b6fb2620f4ff932388163..2c4b6b1c46e4d0db371abe422c3f8ce3e6d06c6b 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -1,3 +1,4 @@
 spi-bcm-qspi-fix-use-after-free-on-unbind.patch
 spi-bcm2835-fix-use-after-free-on-unbind.patch
 ipv4-use-is_enabled-instead-of-ifdef.patch
+wireless-use-linux-stddef.h-instead-of-stddef.h.patch

diff --git a/queue-5.4/wireless-use-linux-stddef.h-instead-of-stddef.h.patch b/queue-5.4/wireless-use-linux-stddef.h-instead-of-stddef.h.patch
new file mode 100644 (file)
index 0000000..c795973
--- /dev/null
+++ b/queue-5.4/wireless-use-linux-stddef.h-instead-of-stddef.h.patch
@@ -0,0 +1,39 @@
+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: wireless: Use linux/stddef.h instead of stddef.h
+
+From: Hauke Mehrtens <hauke@hauke-m.de>
+
+commit 1b9ae0c92925ac40489be526d67d0010d0724ce0 upstream.
+
+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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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 *****************************/
+ /*