diff options
| author | David Howells | 2016-06-27 11:32:02 +0200 |
|---|---|---|
| committer | David Howells | 2016-07-06 11:43:51 +0200 |
| commit | bba304db34ec3ca0d13e7f48e5a4e9896536cacc (patch) | |
| tree | 722839772527934ad566e728e729c3d0290a892c /net/rxrpc/call_accept.c | |
| parent | rxrpc: Provide queuing helper functions (diff) | |
| download | kernel-qcow2-linux-bba304db34ec3ca0d13e7f48e5a4e9896536cacc.tar.gz kernel-qcow2-linux-bba304db34ec3ca0d13e7f48e5a4e9896536cacc.tar.xz kernel-qcow2-linux-bba304db34ec3ca0d13e7f48e5a4e9896536cacc.zip | |
rxrpc: Turn connection #defines into enums and put outside struct def
Turn the connection event and state #define lists into enums and move
outside of the struct definition.
Whilst we're at it, change _SERVER to _SERVICE in those identifiers and add
EV_ into the event name to distinguish them from flags and states.
Also add a symbol indicating the number of states and use that in the state
text array.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/call_accept.c')
| -rw-r--r-- | net/rxrpc/call_accept.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/rxrpc/call_accept.c b/net/rxrpc/call_accept.c index 202e053a3c6d..1c0860df150e 100644 --- a/net/rxrpc/call_accept.c +++ b/net/rxrpc/call_accept.c @@ -128,12 +128,12 @@ static int rxrpc_accept_incoming_call(struct rxrpc_local *local, spin_lock(&call->conn->state_lock); if (sp->hdr.securityIndex > 0 && - call->conn->state == RXRPC_CONN_SERVER_UNSECURED) { + call->conn->state == RXRPC_CONN_SERVICE_UNSECURED) { _debug("await conn sec"); list_add_tail(&call->accept_link, &rx->secureq); - call->conn->state = RXRPC_CONN_SERVER_CHALLENGING; + call->conn->state = RXRPC_CONN_SERVICE_CHALLENGING; rxrpc_get_connection(call->conn); - set_bit(RXRPC_CONN_CHALLENGE, &call->conn->events); + set_bit(RXRPC_CONN_EV_CHALLENGE, &call->conn->events); rxrpc_queue_conn(call->conn); } else { _debug("conn ready"); |