From 13ae80a0552b7645f50b9a6c66b70e6a70462cae Mon Sep 17 00:00:00 2001
From: Tom Herbert <therbert@google.com>
Date: Mon, 5 Apr 2010 14:37:19 -0700
Subject: [PATCH] --- yaml --- r: 193955 b: refs/heads/master c:
 5a6d234e73d7d021c74e1aa349b3b37b81372c66 h: refs/heads/master i:   193953:
 38e36d345a2d35b2a4ec4bd9279f7a478f4adeed   193951:
 80fa49b48a9cf7be2ac18cd07b58eb8dd3a4c9f6 v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);