Message ID | 20160215190200.11338.84808.stgit@localhost.localdomain |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
Hi Alan, [auto build test ERROR on net-next/master] [also build test ERROR on v4.5-rc4 next-20160215] [if your patch is applied to the wrong git tree, please drop us a note to help improving the system] url: https://github.com/0day-ci/linux/commits/Alan/af_llc-fix-types-on-llc_ui_wait_for_conn/20160216-030508 config: x86_64-randconfig-x019-201607 (attached as .config) reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All error/warnings (new ones prefixed by >>): >> net/llc/af_llc.c:554:13: error: conflicting types for 'llc_ui_wait_for_conn' static long llc_ui_wait_for_conn(struct sock *sk, long timeout) ^ net/llc/af_llc.c:41:12: note: previous declaration of 'llc_ui_wait_for_conn' was here static int llc_ui_wait_for_conn(struct sock *sk, long timeout); ^ >> net/llc/af_llc.c:41:12: warning: 'llc_ui_wait_for_conn' used but never defined net/llc/af_llc.c:554:13: warning: 'llc_ui_wait_for_conn' defined but not used [-Wunused-function] static long llc_ui_wait_for_conn(struct sock *sk, long timeout) ^ vim +/llc_ui_wait_for_conn +554 net/llc/af_llc.c 548 rc = 0; 549 } 550 finish_wait(sk_sleep(sk), &wait); 551 return rc; 552 } 553 > 554 static long llc_ui_wait_for_conn(struct sock *sk, long timeout) 555 { 556 DEFINE_WAIT(wait); 557 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index 8dab4e5..f05a2cb 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c @@ -551,7 +551,7 @@ static int llc_ui_wait_for_disc(struct sock *sk, long timeout) return rc; } -static int llc_ui_wait_for_conn(struct sock *sk, long timeout) +static long llc_ui_wait_for_conn(struct sock *sk, long timeout) { DEFINE_WAIT(wait);
The timeout is a long, we return it truncated if it is huge. Basically harmless as the only caller does a boolean check, but tidy it up anyway. Signed-off-by: Alan Cox <alan@linux.intel.com> --- net/llc/af_llc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)