Commit a6b9a7f7 authored May 21, 2020 by Hauke Mehrtens Committed by Greg Kroah-Hartman Dec 02, 2020

wireless: Use linux/stddef.h instead of stddef.h

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>

parent d0ffa852

include/uapi/linux/wireless.h

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -74,7 +74,11 @@
	#include <linux/socket.h> /* for "struct sockaddr" et al */		#include <linux/socket.h> /* for "struct sockaddr" et al */
	#include <linux/if.h> /* for IFNAMSIZ and co... */		#include <linux/if.h> /* for IFNAMSIZ and co... */

			#ifdef __KERNEL__
			# include <linux/stddef.h> /* for offsetof */
			#else
	# include <stddef.h> /* for offsetof */		# include <stddef.h> /* for offsetof */
			#endif

	/*************************** VERSION ***************************/		/*************************** VERSION ***************************/
	/*		/*