OSDN Git Service

af_llc: fix types on llc_ui_wait_for_conn
authorOne Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>
Mon, 15 Feb 2016 19:41:51 +0000 (19:41 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 17 Feb 2016 21:12:13 +0000 (16:12 -0500)
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.

(64bit build tested this time. Thank you 0day)

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/llc/af_llc.c

index 8dab4e5..b3c52e3 100644 (file)
@@ -38,7 +38,7 @@ static u16 llc_ui_sap_link_no_max[256];
 static struct sockaddr_llc llc_ui_addrnull;
 static const struct proto_ops llc_ui_ops;
 
-static int llc_ui_wait_for_conn(struct sock *sk, long timeout);
+static long llc_ui_wait_for_conn(struct sock *sk, long timeout);
 static int llc_ui_wait_for_disc(struct sock *sk, long timeout);
 static int llc_ui_wait_for_busy_core(struct sock *sk, long timeout);
 
@@ -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);