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); }