rxrpc: Clean up connection abort

[linux-2.6-block.git] / net / rxrpc / call_object.c

diff --git a/net/rxrpc/call_object.c b/net/rxrpc/call_object.c
index 13aac3ca03a036322c3b94b96ca21ba618842f96..666430182dfd60bb3a968caab666956c8d54e62a 100644 (file)
--- a/net/rxrpc/call_object.c
+++ b/net/rxrpc/call_object.c
@@ -443,14 +443,10 @@ void rxrpc_incoming_call(struct rxrpc_sock *rx,
                call->state = RXRPC_CALL_SERVER_RECV_REQUEST;
                break;
 
-       case RXRPC_CONN_REMOTELY_ABORTED:
-               __rxrpc_set_call_completion(call, RXRPC_CALL_REMOTELY_ABORTED,
+       case RXRPC_CONN_ABORTED:
+               __rxrpc_set_call_completion(call, conn->completion,
                                            conn->abort_code, conn->error);
                break;
-       case RXRPC_CONN_LOCALLY_ABORTED:
-               __rxrpc_abort_call("CON", call, 1,
-                                  conn->abort_code, conn->error);
-               break;
        default:
                BUG();
        }