Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[deliverable/linux.git] / net / rxrpc / ar-output.c

diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
index 14c8df6b7f41449d3bbe406c4edfdd07cf649bab..d36fb6e1a29ca64a7db3ecb1686738150bd8b50c 100644 (file)
--- a/net/rxrpc/ar-output.c
+++ b/net/rxrpc/ar-output.c
@@ -21,7 +21,7 @@
 /*
  * Time till packet resend (in jiffies).
  */
-unsigned rxrpc_resend_timeout = 4 * HZ;
+unsigned int rxrpc_resend_timeout = 4 * HZ;
 
 static int rxrpc_send_data(struct rxrpc_sock *rx,
                           struct rxrpc_call *call,