diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2021-12-26 16:01:27 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-01-05 12:30:27 +0100 |
| commit | f637d1eb646ca8b82c0b7511cda9c565aeba17be (patch) | |
| tree | 99521973746c312d920445a89a12b18542b2fc86 | |
| parent | ce46aae2bfa94c7723abdef74f4a425997807b50 (diff) | |
| download | linux-stable-f637d1eb646ca8b82c0b7511cda9c565aeba17be.tar.gz linux-stable-f637d1eb646ca8b82c0b7511cda9c565aeba17be.tar.bz2 linux-stable-f637d1eb646ca8b82c0b7511cda9c565aeba17be.zip | |
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: 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>
| -rw-r--r-- | include/uapi/linux/nfc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/nfc.h b/include/uapi/linux/nfc.h index f8ccc12dad14..1b6d54a328ba 100644 --- a/include/uapi/linux/nfc.h +++ b/include/uapi/linux/nfc.h @@ -261,7 +261,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; @@ -269,7 +269,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; |