| Message ID | 20200801143959.211300-1-fw@strlen.de |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] mptcp: fix syncookie build error on UP | expand |
From: Florian Westphal <fw@strlen.de> Date: Sat, 1 Aug 2020 16:39:59 +0200 > kernel test robot says: > net/mptcp/syncookies.c: In function 'mptcp_join_cookie_init': > include/linux/kernel.h:47:38: warning: division by zero [-Wdiv-by-zero] > #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) > > I forgot that spinock_t size is 0 on UP, so ARRAY_SIZE cannot be used. > > Fixes: 9466a1ccebbe54 ("mptcp: enable JOIN requests even if cookies are in use") > Reported-by: kernel test robot <lkp@intel.com> > Signed-off-by: Florian Westphal <fw@strlen.de> Applied, thanks.
diff --git a/net/mptcp/syncookies.c b/net/mptcp/syncookies.c index 6eb992789b50..abe0fd099746 100644 --- a/net/mptcp/syncookies.c +++ b/net/mptcp/syncookies.c @@ -125,8 +125,6 @@ void __init mptcp_join_cookie_init(void) { int i; - for (i = 0; i < ARRAY_SIZE(join_entry_locks); i++) + for (i = 0; i < COOKIE_JOIN_SLOTS; i++) spin_lock_init(&join_entry_locks[i]); - - BUILD_BUG_ON(ARRAY_SIZE(join_entry_locks) != ARRAY_SIZE(join_entries)); }
kernel test robot says: net/mptcp/syncookies.c: In function 'mptcp_join_cookie_init': include/linux/kernel.h:47:38: warning: division by zero [-Wdiv-by-zero] #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) I forgot that spinock_t size is 0 on UP, so ARRAY_SIZE cannot be used. Fixes: 9466a1ccebbe54 ("mptcp: enable JOIN requests even if cookies are in use") Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Florian Westphal <fw@strlen.de> --- net/mptcp/syncookies.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)