Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts were easy to resolve using immediate context mostly,
except the cls_u32.c one where I simply too the entire HEAD
chunk.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 2 deletions

diff --git a/net/rxrpc/call_object.c b/net/rxrpc/call_object.c
index 799f75b6900d..8f1a8f85b1f9 100644
--- a/net/rxrpc/call_object.c
+++ b/net/rxrpc/call_object.c
@@ -138,6 +138,7 @@ struct rxrpc_call *rxrpc_alloc_call(struct rxrpc_sock *rx, gfp_t gfp,
         init_waitqueue_head(&call->waitq);
         spin_lock_init(&call->lock);
         spin_lock_init(&call->notify_lock);
+        spin_lock_init(&call->input_lock);
         rwlock_init(&call->state_lock);
         atomic_set(&call->usage, 1);
         call->debug_id = debug_id;
@@ -287,7 +288,7 @@ struct rxrpc_call *rxrpc_new_client_call(struct rxrpc_sock *rx,
         /* Set up or get a connection record and set the protocol parameters,
          * including channel number and call ID.
          */
-        ret = rxrpc_connect_call(call, cp, srx, gfp);
+        ret = rxrpc_connect_call(rx, call, cp, srx, gfp);
         if (ret < 0)
                 goto error;
 
@@ -339,7 +340,7 @@ int rxrpc_retry_client_call(struct rxrpc_sock *rx,
         /* Set up or get a connection record and set the protocol parameters,
          * including channel number and call ID.
          */
-        ret = rxrpc_connect_call(call, cp, srx, gfp);
+        ret = rxrpc_connect_call(rx, call, cp, srx, gfp);
         if (ret < 0)
                 goto error;