---

yaml --- r: 215236 b: refs/heads/master c: f13d493 h: refs/heads/master v: v3
git-mirror · Oct 20, 2010 · f20e2f2 · f20e2f2
1 parent 795bca1
commit f20e2f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ff76c951c5194d44a7cdce51d807d67fc3ae514
+refs/heads/master: f13d493d9cf772d510d78ae00bb9f4d680b3170b
diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c
@@ -156,15 +156,8 @@ static void poll_napi(struct net_device *dev)
 {
 	struct napi_struct *napi;
 	int budget = 16;
-	struct softnet_data *sd = &__get_cpu_var(softnet_data);
-	struct list_head *nlist;
 
-	if (dev->flags & IFF_MASTER)
-		nlist = &sd->poll_list;
-	else
-		nlist = &dev->napi_list;
-
-	list_for_each_entry(napi, nlist, dev_list) {
+	list_for_each_entry(napi, &dev->napi_list, dev_list) {
 		if (napi->poll_owner != smp_processor_id() &&
 		    spin_trylock(&napi->poll_lock)) {
 			budget = poll_one_napi(dev->npinfo, napi, budget);