lkml.org 
[lkml]   [2020]   [Dec]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 09/98] wireless: Use linux/stddef.h instead of stddef.h
    Date
    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 *****************************/
    /*

    \
     
     \ /
      Last update: 2020-12-01 10:27    [W:4.275 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site