summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorKuniyuki Iwashima <kuniyu@amazon.com>2022-07-20 03:57:50 +0300
committerJakub Kicinski <kuba@kernel.org>2022-07-21 07:02:15 +0300
commitf12b86c0d60689aa3973bab1fcea0ead9d77e23b (patch)
treed97458089537f93a22e59a76254979c398683633 /tools
parent09765fcd3c71c47bf160d325bf4cce5c5bb39292 (diff)
downloadlinux-f12b86c0d60689aa3973bab1fcea0ead9d77e23b.tar.xz
selftests: net: af_unix: Fix a build error of unix_connect.c.
This patch fixes a build error reported in the link. [0] unix_connect.c: In function ‘unix_connect_test’: unix_connect.c:115:55: error: expected identifier before ‘(’ token #define offsetof(type, member) ((size_t)&((type *)0)->(member)) ^ unix_connect.c:128:12: note: in expansion of macro ‘offsetof’ addrlen = offsetof(struct sockaddr_un, sun_path) + variant->len; ^~~~~~~~ We can fix this by removing () around member, but checkpatch will complain about it, and the root cause of the build failure is that I followed the warning and fixed this in the v2 -> v3 change of the blamed commit. [1] CHECK: Macro argument 'member' may be better as '(member)' to avoid precedence issues #33: FILE: tools/testing/selftests/net/af_unix/unix_connect.c:115: +#define offsetof(type, member) ((size_t)&((type *)0)->member) To avoid this warning, let's use offsetof() defined in stddef.h instead. [0]: https://lore.kernel.org/linux-mm/202207182205.FrkMeDZT-lkp@intel.com/ [1]: https://lore.kernel.org/netdev/20220702154818.66761-1-kuniyu@amazon.com/ Fixes: e95ab1d85289 ("selftests: net: af_unix: Test connect() with different netns.") Reported-by: kernel test robot <lkp@intel.com> Suggested-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> Link: https://lore.kernel.org/r/20220720005750.16600-1-kuniyu@amazon.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/testing/selftests/net/af_unix/unix_connect.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/testing/selftests/net/af_unix/unix_connect.c b/tools/testing/selftests/net/af_unix/unix_connect.c
index 157e44ef7f37..d799fd8f5c7c 100644
--- a/tools/testing/selftests/net/af_unix/unix_connect.c
+++ b/tools/testing/selftests/net/af_unix/unix_connect.c
@@ -3,6 +3,7 @@
#define _GNU_SOURCE
#include <sched.h>
+#include <stddef.h>
#include <stdio.h>
#include <unistd.h>
@@ -112,8 +113,6 @@ FIXTURE_TEARDOWN(unix_connect)
remove("test");
}
-#define offsetof(type, member) ((size_t)&((type *)0)->(member))
-
TEST_F(unix_connect, test)
{
socklen_t addrlen;