diff options
author | David Howells <dhowells@redhat.com> | 2007-05-22 19:14:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-05-22 19:14:24 -0400 |
commit | 1f8481d19af005c469ee50cf972486240905585e (patch) | |
tree | 5e099ffda8ce946b18391db8d7ceeadfab241a8f | |
parent | 71a904bf49582f1866e2d6f9ce0a186af9a50b39 (diff) |
[AF_RXRPC]: Make call state names available if CONFIG_PROC_FS=n
Make the call state names array available even if CONFIG_PROC_FS is
disabled as it's used in other places (such as debugging statements)
too.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/rxrpc/ar-call.c | 19 | ||||
-rw-r--r-- | net/rxrpc/ar-proc.c | 19 |
2 files changed, 19 insertions, 19 deletions
diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c index 4d92d88ff1fc..3c04b00dab74 100644 --- a/net/rxrpc/ar-call.c +++ b/net/rxrpc/ar-call.c | |||
@@ -15,6 +15,25 @@ | |||
15 | #include <net/af_rxrpc.h> | 15 | #include <net/af_rxrpc.h> |
16 | #include "ar-internal.h" | 16 | #include "ar-internal.h" |
17 | 17 | ||
18 | const char *rxrpc_call_states[] = { | ||
19 | [RXRPC_CALL_CLIENT_SEND_REQUEST] = "ClSndReq", | ||
20 | [RXRPC_CALL_CLIENT_AWAIT_REPLY] = "ClAwtRpl", | ||
21 | [RXRPC_CALL_CLIENT_RECV_REPLY] = "ClRcvRpl", | ||
22 | [RXRPC_CALL_CLIENT_FINAL_ACK] = "ClFnlACK", | ||
23 | [RXRPC_CALL_SERVER_SECURING] = "SvSecure", | ||
24 | [RXRPC_CALL_SERVER_ACCEPTING] = "SvAccept", | ||
25 | [RXRPC_CALL_SERVER_RECV_REQUEST] = "SvRcvReq", | ||
26 | [RXRPC_CALL_SERVER_ACK_REQUEST] = "SvAckReq", | ||
27 | [RXRPC_CALL_SERVER_SEND_REPLY] = "SvSndRpl", | ||
28 | [RXRPC_CALL_SERVER_AWAIT_ACK] = "SvAwtACK", | ||
29 | [RXRPC_CALL_COMPLETE] = "Complete", | ||
30 | [RXRPC_CALL_SERVER_BUSY] = "SvBusy ", | ||
31 | [RXRPC_CALL_REMOTELY_ABORTED] = "RmtAbort", | ||
32 | [RXRPC_CALL_LOCALLY_ABORTED] = "LocAbort", | ||
33 | [RXRPC_CALL_NETWORK_ERROR] = "NetError", | ||
34 | [RXRPC_CALL_DEAD] = "Dead ", | ||
35 | }; | ||
36 | |||
18 | struct kmem_cache *rxrpc_call_jar; | 37 | struct kmem_cache *rxrpc_call_jar; |
19 | LIST_HEAD(rxrpc_calls); | 38 | LIST_HEAD(rxrpc_calls); |
20 | DEFINE_RWLOCK(rxrpc_call_lock); | 39 | DEFINE_RWLOCK(rxrpc_call_lock); |
diff --git a/net/rxrpc/ar-proc.c b/net/rxrpc/ar-proc.c index 58f4b4e5cece..1c0be0e77b16 100644 --- a/net/rxrpc/ar-proc.c +++ b/net/rxrpc/ar-proc.c | |||
@@ -25,25 +25,6 @@ static const char *rxrpc_conn_states[] = { | |||
25 | [RXRPC_CONN_NETWORK_ERROR] = "NetError", | 25 | [RXRPC_CONN_NETWORK_ERROR] = "NetError", |
26 | }; | 26 | }; |
27 | 27 | ||
28 | const char *rxrpc_call_states[] = { | ||
29 | [RXRPC_CALL_CLIENT_SEND_REQUEST] = "ClSndReq", | ||
30 | [RXRPC_CALL_CLIENT_AWAIT_REPLY] = "ClAwtRpl", | ||
31 | [RXRPC_CALL_CLIENT_RECV_REPLY] = "ClRcvRpl", | ||
32 | [RXRPC_CALL_CLIENT_FINAL_ACK] = "ClFnlACK", | ||
33 | [RXRPC_CALL_SERVER_SECURING] = "SvSecure", | ||
34 | [RXRPC_CALL_SERVER_ACCEPTING] = "SvAccept", | ||
35 | [RXRPC_CALL_SERVER_RECV_REQUEST] = "SvRcvReq", | ||
36 | [RXRPC_CALL_SERVER_ACK_REQUEST] = "SvAckReq", | ||
37 | [RXRPC_CALL_SERVER_SEND_REPLY] = "SvSndRpl", | ||
38 | [RXRPC_CALL_SERVER_AWAIT_ACK] = "SvAwtACK", | ||
39 | [RXRPC_CALL_COMPLETE] = "Complete", | ||
40 | [RXRPC_CALL_SERVER_BUSY] = "SvBusy ", | ||
41 | [RXRPC_CALL_REMOTELY_ABORTED] = "RmtAbort", | ||
42 | [RXRPC_CALL_LOCALLY_ABORTED] = "LocAbort", | ||
43 | [RXRPC_CALL_NETWORK_ERROR] = "NetError", | ||
44 | [RXRPC_CALL_DEAD] = "Dead ", | ||
45 | }; | ||
46 | |||
47 | /* | 28 | /* |
48 | * generate a list of extant and dead calls in /proc/net/rxrpc_calls | 29 | * generate a list of extant and dead calls in /proc/net/rxrpc_calls |
49 | */ | 30 | */ |