diff options
| author | David Howells <dhowells@redhat.com> | 2017-01-05 10:38:36 +0000 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2017-01-09 11:10:02 +0000 |
| commit | 210f035316f545e6f507e7d61e191495ba983e27 (patch) | |
| tree | 2e8a73099c2adf217251136bad50a8ec4bac840b /net/rxrpc/call_accept.c | |
| parent | 56ff9c837778ba2cf76f29c966856a9341e5939d (diff) | |
| download | linux-210f035316f545e6f507e7d61e191495ba983e27.tar.gz linux-210f035316f545e6f507e7d61e191495ba983e27.tar.xz | |
rxrpc: Allow listen(sock, 0) to be used to disable listening
Allow listen() with a backlog of 0 to be used to disable listening on an
AF_RXRPC socket. This also releases any preallocation, thereby making it
easier for a kernel service to account for all allocated call structures
when shutting down the service.
The socket cannot thereafter have listening reenabled, but must rather be
closed and reopened.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/call_accept.c')
| -rw-r--r-- | net/rxrpc/call_accept.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/rxrpc/call_accept.c b/net/rxrpc/call_accept.c index 832d854c2d5c..7c4c64ab8da2 100644 --- a/net/rxrpc/call_accept.c +++ b/net/rxrpc/call_accept.c @@ -349,7 +349,8 @@ struct rxrpc_call *rxrpc_new_incoming_call(struct rxrpc_local *local, found_service: spin_lock(&rx->incoming_lock); - if (rx->sk.sk_state == RXRPC_CLOSE) { + if (rx->sk.sk_state == RXRPC_SERVER_LISTEN_DISABLED || + rx->sk.sk_state == RXRPC_CLOSE) { trace_rxrpc_abort("CLS", sp->hdr.cid, sp->hdr.callNumber, sp->hdr.seq, RX_INVALID_OPERATION, ESHUTDOWN); skb->mark = RXRPC_SKB_MARK_LOCAL_ABORT; |