diff options
author | David Howells <dhowells@redhat.com> | 2016-03-04 10:53:46 -0500 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2016-03-04 10:53:46 -0500 |
commit | 4c198ad17a7253cc8ef3ff39bfe73d6b5e65ceef (patch) | |
tree | 50e0727cfa2de837b9a97400b6988b6a97abd944 /net/rxrpc/ar-internal.h | |
parent | 5b8848d14912d5e9974d5d83d71ed6cba2b49345 (diff) |
rxrpc: Rename call events to begin RXRPC_CALL_EV_
Rename call event names to begin RXRPC_CALL_EV_ to distinguish them from the
flags.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/ar-internal.h')
-rw-r--r-- | net/rxrpc/ar-internal.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h index 3aea424a88e4..3f2940626569 100644 --- a/net/rxrpc/ar-internal.h +++ b/net/rxrpc/ar-internal.h | |||
@@ -311,23 +311,23 @@ enum rxrpc_call_flag { | |||
311 | * Events that can be raised on a call. | 311 | * Events that can be raised on a call. |
312 | */ | 312 | */ |
313 | enum rxrpc_call_event { | 313 | enum rxrpc_call_event { |
314 | RXRPC_CALL_RCVD_ACKALL, /* ACKALL or reply received */ | 314 | RXRPC_CALL_EV_RCVD_ACKALL, /* ACKALL or reply received */ |
315 | RXRPC_CALL_RCVD_BUSY, /* busy packet received */ | 315 | RXRPC_CALL_EV_RCVD_BUSY, /* busy packet received */ |
316 | RXRPC_CALL_RCVD_ABORT, /* abort packet received */ | 316 | RXRPC_CALL_EV_RCVD_ABORT, /* abort packet received */ |
317 | RXRPC_CALL_RCVD_ERROR, /* network error received */ | 317 | RXRPC_CALL_EV_RCVD_ERROR, /* network error received */ |
318 | RXRPC_CALL_ACK_FINAL, /* need to generate final ACK (and release call) */ | 318 | RXRPC_CALL_EV_ACK_FINAL, /* need to generate final ACK (and release call) */ |
319 | RXRPC_CALL_ACK, /* need to generate ACK */ | 319 | RXRPC_CALL_EV_ACK, /* need to generate ACK */ |
320 | RXRPC_CALL_REJECT_BUSY, /* need to generate busy message */ | 320 | RXRPC_CALL_EV_REJECT_BUSY, /* need to generate busy message */ |
321 | RXRPC_CALL_ABORT, /* need to generate abort */ | 321 | RXRPC_CALL_EV_ABORT, /* need to generate abort */ |
322 | RXRPC_CALL_CONN_ABORT, /* local connection abort generated */ | 322 | RXRPC_CALL_EV_CONN_ABORT, /* local connection abort generated */ |
323 | RXRPC_CALL_RESEND_TIMER, /* Tx resend timer expired */ | 323 | RXRPC_CALL_EV_RESEND_TIMER, /* Tx resend timer expired */ |
324 | RXRPC_CALL_RESEND, /* Tx resend required */ | 324 | RXRPC_CALL_EV_RESEND, /* Tx resend required */ |
325 | RXRPC_CALL_DRAIN_RX_OOS, /* drain the Rx out of sequence queue */ | 325 | RXRPC_CALL_EV_DRAIN_RX_OOS, /* drain the Rx out of sequence queue */ |
326 | RXRPC_CALL_LIFE_TIMER, /* call's lifetimer ran out */ | 326 | RXRPC_CALL_EV_LIFE_TIMER, /* call's lifetimer ran out */ |
327 | RXRPC_CALL_ACCEPTED, /* incoming call accepted by userspace app */ | 327 | RXRPC_CALL_EV_ACCEPTED, /* incoming call accepted by userspace app */ |
328 | RXRPC_CALL_SECURED, /* incoming call's connection is now secure */ | 328 | RXRPC_CALL_EV_SECURED, /* incoming call's connection is now secure */ |
329 | RXRPC_CALL_POST_ACCEPT, /* need to post an "accept?" message to the app */ | 329 | RXRPC_CALL_EV_POST_ACCEPT, /* need to post an "accept?" message to the app */ |
330 | RXRPC_CALL_RELEASE, /* need to release the call's resources */ | 330 | RXRPC_CALL_EV_RELEASE, /* need to release the call's resources */ |
331 | }; | 331 | }; |
332 | 332 | ||
333 | /* | 333 | /* |
@@ -440,7 +440,7 @@ static inline void rxrpc_abort_call(struct rxrpc_call *call, u32 abort_code) | |||
440 | if (call->state < RXRPC_CALL_COMPLETE) { | 440 | if (call->state < RXRPC_CALL_COMPLETE) { |
441 | call->abort_code = abort_code; | 441 | call->abort_code = abort_code; |
442 | call->state = RXRPC_CALL_LOCALLY_ABORTED; | 442 | call->state = RXRPC_CALL_LOCALLY_ABORTED; |
443 | set_bit(RXRPC_CALL_ABORT, &call->events); | 443 | set_bit(RXRPC_CALL_EV_ABORT, &call->events); |
444 | } | 444 | } |
445 | write_unlock_bh(&call->state_lock); | 445 | write_unlock_bh(&call->state_lock); |
446 | } | 446 | } |