---

yaml --- r: 195144 b: refs/heads/master c: ebda37c h: refs/heads/master v: v3
git-mirror · May 18, 2010 · 2b4fee2 · 2b4fee2
1 parent 8e43062
commit 2b4fee2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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);
 		}