[PATCH resend] uapi: fix linux/nfc.h userspace compilation errors

From: Dmitry V. Levin
Date: Sat Dec 25 2021 - 18:42:49 EST


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;

Link: https://lore.kernel.org/lkml/20170220181613.GB11185@xxxxxxxxxxxx/
Signed-off-by: Dmitry V. Levin <ldv@xxxxxxxxxxxx>
---
The patch was submitted almost 5 years ago, and I was under impression
that it was applied among others of this kind, but, apparently,
it's still relevant.

include/uapi/linux/nfc.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/uapi/linux/nfc.h b/include/uapi/linux/nfc.h
index f6e3c8c9c744..aadad43d943a 100644
--- 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;

--
ldv