diff options
| author | One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk> | 2016-02-15 19:41:51 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-17 16:12:13 -0500 |
| commit | 82aaf4fcbe0f26adb14e72c9df6a2c4ed3f8c34d (patch) | |
| tree | 577d858393f95d194e9d14a95624a008677d4ff8 | |
| parent | fc48b7a6148af974b49db145812a8b060324a503 (diff) | |
| download | linux-82aaf4fcbe0f26adb14e72c9df6a2c4ed3f8c34d.tar.gz linux-82aaf4fcbe0f26adb14e72c9df6a2c4ed3f8c34d.tar.bz2 linux-82aaf4fcbe0f26adb14e72c9df6a2c4ed3f8c34d.zip | |
af_llc: fix types on llc_ui_wait_for_conn
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>
| -rw-r--r-- | net/llc/af_llc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index 8dab4e569571..b3c52e3f689a 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c @@ -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); |