提交 2ccfb70f 编写于 作者: K Krzysztof Kozlowski 提交者: Zheng Zengkai

nfc: uapi: use kernel size_t to fix user-space builds

stable inclusion
from stable-v5.10.90
commit 818c9e0a04dff8fdec3ff70afcd25b945d8621d0
bugzilla: 186168 https://gitee.com/openeuler/kernel/issues/I4SHY1

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=818c9e0a04dff8fdec3ff70afcd25b945d8621d0

--------------------------------

commit 79b69a83 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: d646960f ("NFC: Initial LLCP support")
Cc: <stable@vger.kernel.org>
Signed-off-by: NKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 9e1f0c0d
...@@ -278,7 +278,7 @@ struct sockaddr_nfc_llcp { ...@@ -278,7 +278,7 @@ struct sockaddr_nfc_llcp {
__u8 dsap; /* Destination SAP, if known */ __u8 dsap; /* Destination SAP, if known */
__u8 ssap; /* Source SAP to be bound to */ __u8 ssap; /* Source SAP to be bound to */
char service_name[NFC_LLCP_MAX_SERVICE_NAME]; /* Service name URI */; 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 */ /* NFC socket protocols */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册