Commit f637d1eb authored Dec 26, 2021 by Dmitry V. Levin Committed by Greg Kroah-Hartman Jan 05, 2022

uapi: fix linux/nfc.h userspace compilation errors



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: 23b7869c ("NFC: add the NFC socket raw protocol")
Fixes: d646960f ("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>

parent ce46aae2

include/uapi/linux/nfc.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -261,7 +261,7 @@ enum nfc_sdp_attr {
	#define NFC_SE_ENABLED 0x1		#define NFC_SE_ENABLED 0x1

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

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