---

yaml --- r: 256031 b: refs/heads/master c: 2a49e00 h: refs/heads/master i: 256029: 6e23c9c 256027: 4af2c28 256023: 2766087 256015: 8099e64 255999: 8b6a99d v: v3
git-mirror · Jul 4, 2011 · 0d6d99d · 0d6d99d
1 parent c0ce8e3
commit 0d6d99d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 234b921dbcf144826e2e2b3663cd8090892ee2b2
+refs/heads/master: 2a49e001cbe3ebf5987024052ed0dff67689c5bb
diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c
@@ -209,11 +209,6 @@ static void netpoll_poll_dev(struct net_device *dev)
 	zap_completion_queue();
 }
 
-static void netpoll_poll(struct netpoll *np)
-{
-	netpoll_poll_dev(np->dev);
-}
-
 static void refill_skbs(void)
 {
 	struct sk_buff *skb;
@@ -273,7 +268,7 @@ static struct sk_buff *find_skb(struct netpoll *np, int len, int reserve)
 
 	if (!skb) {
 		if (++count < 10) {
-			netpoll_poll(np);
+			netpoll_poll_dev(np->dev);
 			goto repeat;
 		}
 		return NULL;
@@ -334,7 +329,7 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
 			}
 
 			/* tickle device maybe there is some cleanup */
-			netpoll_poll(np);
+			netpoll_poll_dev(np->dev);
 
 			udelay(USEC_PER_POLL);
 		}