summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2016-09-07 16:26:39 +0200
committerDavid Howells <dhowells@redhat.com>2016-09-07 16:30:22 +0200
commit6543ac523558b2392271f3f8088e6455b3f00bb1 (patch)
tree22d32c4e2f0a2cf0ca8e181d91da2ac0193e20c4
parentrxrpc: Pass the connection pointer to rxrpc_post_packet_to_call() (diff)
downloadlinux-6543ac523558b2392271f3f8088e6455b3f00bb1.tar.xz
linux-6543ac523558b2392271f3f8088e6455b3f00bb1.zip
rxrpc: Use rxrpc_is_service_call() rather than rxrpc_conn_is_service()
Use rxrpc_is_service_call() rather than rxrpc_conn_is_service() if the call is available just in case call->conn is NULL. Signed-off-by: David Howells <dhowells@redhat.com>
-rw-r--r--net/rxrpc/input.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c
index 52da4373131f..8267f42a7753 100644
--- a/net/rxrpc/input.c
+++ b/net/rxrpc/input.c
@@ -357,7 +357,7 @@ void rxrpc_fast_process_packet(struct rxrpc_call *call, struct sk_buff *skb)
case RXRPC_PACKET_TYPE_BUSY:
_proto("Rx BUSY %%%u", sp->hdr.serial);
- if (rxrpc_conn_is_service(call->conn))
+ if (rxrpc_is_service_call(call))
goto protocol_error;
write_lock_bh(&call->state_lock);
@@ -525,7 +525,7 @@ static void rxrpc_post_packet_to_call(struct rxrpc_connection *conn,
default:
goto dead_call;
case RXRPC_CALL_SUCCEEDED:
- if (rxrpc_conn_is_service(call->conn))
+ if (rxrpc_is_service_call(call))
goto dead_call;
goto resend_final_ack;
}