diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2022-02-09 20:00:28 +0200 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2022-02-09 20:00:28 +0200 |
| commit | 2e69f2ae550dcfbde1ffb6daa11492762b122191 (patch) | |
| tree | 598e8922509ca50771d3a609d0c63eca90a1ecb2 /include/uapi | |
| parent | 82e44f01405d6fcccef53c5d2c95cf2fbbda9075 (diff) | |
| parent | 5626e6fca8c361bc552bf8005d19c301eddea784 (diff) | |
Merge remote-tracking branch 'msm8998/lineage-18.1' into lineage-18.1
Change-Id: I073391b643e7886de4ca06ca24caab848510f2bd
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/nfc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/uapi/linux/nfc.h b/include/uapi/linux/nfc.h index 399f39ff8048..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,14 +269,14 @@ 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; __u8 dsap; /* Destination SAP, if known */ __u8 ssap; /* Source SAP to be bound to */ char service_name[NFC_LLCP_MAX_SERVICE_NAME]; /* Service name URI */; - size_t service_name_len; + __kernel_size_t service_name_len; }; /* NFC socket protocols */ |