From patchwork Fri Jul 1 01:08:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Perches X-Patchwork-Id: 102849 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8CB7FB6F57 for ; Fri, 1 Jul 2011 11:09:29 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754630Ab1GABJF (ORCPT ); Thu, 30 Jun 2011 21:09:05 -0400 Received: from mail.perches.com ([173.55.12.10]:3387 "EHLO mail.perches.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754615Ab1GABJE (ORCPT ); Thu, 30 Jun 2011 21:09:04 -0400 Received: from Joe-Laptop.home (unknown [192.168.1.162]) by mail.perches.com (Postfix) with ESMTP id C35BB24368; Thu, 30 Jun 2011 18:08:57 -0700 (PDT) From: Joe Perches To: linux-kernel@vger.kernel.org Cc: WANG Cong , "David S. Miller" , netdev@vger.kernel.org Subject: [PATCH 2/2] netpoll: Remove wrapper function netpoll_poll Date: Thu, 30 Jun 2011 18:08:58 -0700 Message-Id: <6d0de0ce0430d29d1808ecba1ce306ccca52247e.1309482314.git.joe@perches.com> X-Mailer: git-send-email 1.7.6.rc1 In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Too trivial to live. cc: WANG Cong Signed-off-by: Joe Perches --- net/core/netpoll.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 4ce595e..adf84dd 100644 --- a/net/core/netpoll.c +++ b/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 @@ repeat: 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); }