From: David Howells <dhowells@redhat.com>
Date: Wed, 7 Sep 2016 14:26:39 +0000 (+0100)
Subject: rxrpc: Use rxrpc_is_service_call() rather than rxrpc_conn_is_service()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=6543ac523558b2392271f3f8088e6455b3f00bb1;p=deliverable%2Flinux.git

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>
---

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;
 		}