| Message ID | 20211226130126.GA13003@altlinux.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7175f02c4e5f5a9430113ab9ca0fd0ce98b28a51 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2] uapi: fix linux/nfc.h userspace compilation errors | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On 26/12/2021 14:01, Dmitry V. Levin wrote: > 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> > --- > v2: Removed Link tag, added Fixes and Cc tags. > > include/uapi/linux/nfc.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Best regards, Krzysztof
On Sun, 26 Dec 2021 16:01:27 +0300 Dmitry V. Levin wrote: > 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> Applied to net: commit 7175f02c4e5f ("uapi: fix linux/nfc.h userspace compilation errors") thanks!
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;
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> --- v2: Removed Link tag, added Fixes and Cc tags. include/uapi/linux/nfc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)