uapi: fix linux/nfc.h userspace compilation errors

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: <redacted>
Signed-off-by: Dmitry V. Levin <redacted>
Reviewed-by: Krzysztof Kozlowski <redacted>
Signed-off-by: David S. Miller <redacted>

diff --git a/include/uapi/linux/nfc.h b/include/uapi/linux/nfc.h
index f6e3c8c9c7449ad6b98623d034128e03a3c9e651..aadad43d943ac4bc5699881002f7fccd2d0d5966 100644 (file)
--- 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 {
 #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;
        __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 {
 
 #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;
        __u32 dev_idx;
        __u32 target_idx;
        __u32 nfc_protocol;