diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-01-18 04:45:32 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-01-19 12:14:02 -0500 |
| commit | 4f5a884fc212d99654e4fb36ba98d5354f0dd18e (patch) | |
| tree | f4ac26f5acd43be75cb9d3b2f89fa92c40dbc8ee /include/uapi/linux/nfc.h | |
| parent | e09fccb5435d7b9ab3fd5dfeada8ae40cfa56e08 (diff) | |
| parent | 5f02ef741a785678930f3ff0a8b6b2b0ef1bb402 (diff) | |
Merge branch 'kvm-pi-raw-spinlock' into HEAD
Bring in fix for VT-d posted interrupts before further changing the code in 5.17.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include/uapi/linux/nfc.h')
| -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 f6e3c8c9c744..4fa4e979e948 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,14 +271,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 */ |