From 0d6d99dc017c961f309831a65c1612b09b1c88ec Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Thu, 30 Jun 2011 15:08:58 +0000
Subject: [PATCH] --- yaml --- r: 256031 b: refs/heads/master c:
 2a49e001cbe3ebf5987024052ed0dff67689c5bb h: refs/heads/master i:   256029:
 6e23c9c6965afb8d83a61c6258890b617b058e83   256027:
 4af2c286d2b2dfbc25b5e6a1c67d2ccfb1b289f6   256023:
 2766087e78acb8321a1bf95bdf5aa932f3df2850   256015:
 8099e6445282e501ed0e2ca977cf411440d89476   255999:
 8b6a99da2af5793bce7e358301aef57a9138a732 v: v3

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

diff --git a/[refs] b/[refs]
index 2a034782d033..b9fc612f34ce 100644
--- 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
index 4ce595e45f91..adf84dd8c7b5 100644
--- 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);
 		}