lkml.org 
[lkml]   [2022]   [Jan]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 19/27] uapi: fix linux/nfc.h userspace compilation errors
    Date
    From: Dmitry V. Levin <ldv@altlinux.org>

    commit 7175f02c4e5f5a9430113ab9ca0fd0ce98b28a51 upstream.

    Replace sa_family_t with __kernel_sa_family_t to fix the following
    linux/nfc.h userspace compilation errors:

    /usr/include/linux/nfc.h:266:2: error: unknown type name 'sa_family_t'
    sa_family_t sa_family;
    /usr/include/linux/nfc.h:274:2: error: unknown type name 'sa_family_t'
    sa_family_t sa_family;

    Fixes: 23b7869c0fd0 ("NFC: add the NFC socket raw protocol")
    Fixes: d646960f7986 ("NFC: Initial LLCP support")
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
    Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    include/uapi/linux/nfc.h | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/include/uapi/linux/nfc.h
    +++ b/include/uapi/linux/nfc.h
    @@ -263,7 +263,7 @@ enum nfc_sdp_attr {
    #define NFC_SE_ENABLED 0x1

    struct sockaddr_nfc {
    - sa_family_t sa_family;
    + __kernel_sa_family_t sa_family;
    __u32 dev_idx;
    __u32 target_idx;
    __u32 nfc_protocol;
    @@ -271,7 +271,7 @@ struct sockaddr_nfc {

    #define NFC_LLCP_MAX_SERVICE_NAME 63
    struct sockaddr_nfc_llcp {
    - sa_family_t sa_family;
    + __kernel_sa_family_t sa_family;
    __u32 dev_idx;
    __u32 target_idx;
    __u32 nfc_protocol;

    \
     
     \ /
      Last update: 2022-01-03 15:26    [W:2.614 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site