diff --git a/[refs] b/[refs] index 22f240cbbe4a..c6aad22c1231 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7bddd0db6248d92adb1f547fd45507af4368d6fa +refs/heads/master: 5a6d234e73d7d021c74e1aa349b3b37b81372c66 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 2a9b7dd0bb6e..74f77ca03349 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -3120,7 +3120,7 @@ static int process_backlog(struct napi_struct *napi, int quota) skb = __skb_dequeue(&queue->input_pkt_queue); if (!skb) { __napi_complete(napi); - spin_unlock_irq(&queue->input_pkt_queue.lock); + rps_unlock(queue); break; } rps_unlock(queue);