diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2022-01-05 13:01:00 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2022-01-05 13:01:00 +0100 |
| commit | 14d5042fdcd703bd08b3cc829aed4f39d448f398 (patch) | |
| tree | 6607dcd0a8d4e7cc04599f64fbbaf518973de3f0 /include/uapi/linux | |
| parent | 7b1717fd47d6113f0cf28e82f7d0dc80e0b05621 (diff) | |
| parent | 0dc4b955f01eae10c6923c86234ef9768137797f (diff) | |
Merge 4.4.298 into android-4.4-p
Changes in 4.4.298
platform/x86: apple-gmux: use resource_size() with res
recordmcount.pl: fix typo in s390 mcount regex
selinux: initialize proto variable in selinux_ip_postroute_compat()
nfc: uapi: use kernel size_t to fix user-space builds
uapi: fix linux/nfc.h userspace compilation errors
xhci: Fresco FL1100 controller should not have BROKEN_MSI quirk set.
usb: gadget: f_fs: Clear ffs_eventfd in ffs_data_clear.
scsi: vmw_pvscsi: Set residual data length conditionally
Input: appletouch - initialize work before device registration
Input: spaceball - fix parsing of movement data packets
net: fix use-after-free in tw_timer_handler
Linux 4.4.298
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If5baf377c3d2fb89e244b005a47ddaccaff9e9f9
Diffstat (limited to 'include/uapi/linux')
| -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 */ |