diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-03-16 11:34:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-03-16 11:34:41 +1000 |
| commit | 38f1cff0863809587b5fd10ecd0c24c8b543a48c (patch) | |
| tree | 7cf6eb88cdc938c3683209d38311e711a1119400 /net/rxrpc/ar-input.c | |
| parent | 4819d2e4310796c4e9eef674499af9b9caf36b5a (diff) | |
| parent | 5359533801e3dd3abca5b7d3d985b0b33fd9fe8b (diff) | |
| download | talos-obmc-linux-38f1cff0863809587b5fd10ecd0c24c8b543a48c.tar.gz talos-obmc-linux-38f1cff0863809587b5fd10ecd0c24c8b543a48c.zip | |
Merge commit '5359533801e3dd3abca5b7d3d985b0b33fd9fe8b' into drm-core-next
This commit changed an internal radeon structure, that meant a new driver
in -next had to be fixed up, merge in the commit and fix up the driver.
Also fixes a trivial nouveau merge.
Conflicts:
drivers/gpu/drm/nouveau/nouveau_mem.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) goto protocol_error; } + case RXRPC_PACKET_TYPE_ACKALL: case RXRPC_PACKET_TYPE_ACK: /* ACK processing is done in process context */ read_lock_bh(&call->state_lock); |
