rxrpc: Use call->peer rather than going to the connection
authorDavid Howells <dhowells@redhat.com>
Tue, 30 Aug 2016 11:36:06 +0000 (12:36 +0100)
committerDavid Howells <dhowells@redhat.com>
Tue, 30 Aug 2016 15:07:53 +0000 (16:07 +0100)
Use call->peer rather than call->conn->params.peer as call->conn may become
NULL.

Signed-off-by: David Howells <dhowells@redhat.com>
net/rxrpc/call_event.c

index 02fe4a4b60d9c1f691dd0a6ba120b1b301602066..de72de6620443684e54961728f38719769521a66 100644 (file)
@@ -551,7 +551,7 @@ static void rxrpc_extract_ackinfo(struct rxrpc_call *call, struct sk_buff *skb,
 
        mtu = min(ntohl(ackinfo.rxMTU), ntohl(ackinfo.maxMTU));
 
-       peer = call->conn->params.peer;
+       peer = call->peer;
        if (mtu < peer->maxdata) {
                spin_lock_bh(&peer->lock);
                peer->maxdata = mtu;
@@ -843,8 +843,8 @@ void rxrpc_process_call(struct work_struct *work)
 
        /* there's a good chance we're going to have to send a message, so set
         * one up in advance */
-       msg.msg_name    = &call->conn->params.peer->srx.transport;
-       msg.msg_namelen = call->conn->params.peer->srx.transport_len;
+       msg.msg_name    = &call->peer->srx.transport;
+       msg.msg_namelen = call->peer->srx.transport_len;
        msg.msg_control = NULL;
        msg.msg_controllen = 0;
        msg.msg_flags   = 0;
@@ -1151,8 +1151,8 @@ skip_msg_init:
 send_ACK_with_skew:
        ack.maxSkew = htons(call->ackr_skew);
 send_ACK:
-       mtu = call->conn->params.peer->if_mtu;
-       mtu -= call->conn->params.peer->hdrsize;
+       mtu = call->peer->if_mtu;
+       mtu -= call->peer->hdrsize;
        ackinfo.maxMTU  = htonl(mtu);
        ackinfo.rwind   = htonl(rxrpc_rx_window_size);