| From 79b69a83705e621b258ac6d8ae6d3bfdb4b930aa Mon Sep 17 00:00:00 2001 |
| From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> |
| Date: Sun, 26 Dec 2021 13:03:47 +0100 |
| Subject: nfc: uapi: use kernel size_t to fix user-space builds |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> |
| |
| commit 79b69a83705e621b258ac6d8ae6d3bfdb4b930aa upstream. |
| |
| Fix user-space builds if it includes /usr/include/linux/nfc.h before |
| some of other headers: |
| |
| /usr/include/linux/nfc.h:281:9: error: unknown type name ‘size_t’ |
| 281 | size_t service_name_len; |
| | ^~~~~~ |
| |
| Fixes: d646960f7986 ("NFC: Initial LLCP support") |
| Cc: <stable@vger.kernel.org> |
| Signed-off-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> |
| --- |
| include/uapi/linux/nfc.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/include/uapi/linux/nfc.h |
| +++ b/include/uapi/linux/nfc.h |
| @@ -278,7 +278,7 @@ struct sockaddr_nfc_llcp { |
| __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 */ |
