From 2b4fee233751e944099a28abbf438f665dda0816 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 6 May 2010 23:51:21 +0000
Subject: [PATCH] --- yaml --- r: 195144 b: refs/heads/master c:
 ebda37c27d0c768947e9b058332d7ea798210cf8 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9f6bae87817f..881fd72a66e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9
+refs/heads/master: ebda37c27d0c768947e9b058332d7ea798210cf8
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 988e42912e72..cdcb9cbedf41 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -2432,8 +2432,10 @@ static int enqueue_to_backlog(struct sk_buff *skb, int cpu,
 			return NET_RX_SUCCESS;
 		}
 
-		/* Schedule NAPI for backlog device */
-		if (napi_schedule_prep(&sd->backlog)) {
+		/* Schedule NAPI for backlog device
+		 * We can use non atomic operation since we own the queue lock
+		 */
+		if (!__test_and_set_bit(NAPI_STATE_SCHED, &sd->backlog.state)) {
 			if (!rps_ipi_queued(sd))
 				____napi_schedule(sd, &sd->backlog);
 		}