diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-03-11 11:10:45 -0500 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-03-11 11:10:45 -0500 |
| commit | c9149556756d56c68451a4a8735c37e7062fd3d7 (patch) | |
| tree | a2dae56b22adaa9a23c8f92f30c3b3ad3b610850 /net/rxrpc/ar-input.c | |
| parent | d71f606f687ef9d0cdddfd3619ca7cb9a0b3fb63 (diff) | |
| parent | 5bfe53a77e8a3ffce4a10003c75f464a138e272d (diff) | |
Merge branch 'slab/rcu' into slab/next
Conflicts:
mm/slub.c
Diffstat (limited to 'net/rxrpc/ar-input.c')
| -rw-r--r-- | net/rxrpc/ar-input.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c index 89315009bab1..1a2b0633fece 100644 --- a/net/rxrpc/ar-input.c +++ b/net/rxrpc/ar-input.c | |||
| @@ -423,6 +423,7 @@ void rxrpc_fast_process_packet(struct rxrpc_call *call, struct sk_buff *skb) | |||
| 423 | goto protocol_error; | 423 | goto protocol_error; |
| 424 | } | 424 | } |
| 425 | 425 | ||
| 426 | case RXRPC_PACKET_TYPE_ACKALL: | ||
| 426 | case RXRPC_PACKET_TYPE_ACK: | 427 | case RXRPC_PACKET_TYPE_ACK: |
| 427 | /* ACK processing is done in process context */ | 428 | /* ACK processing is done in process context */ |
| 428 | read_lock_bh(&call->state_lock); | 429 | read_lock_bh(&call->state_lock); |