From patchwork Wed Feb 17 11:04:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 45598 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 SMTP id 1EEC8B7DBB for ; Wed, 17 Feb 2010 22:07:42 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755347Ab0BQLEg (ORCPT ); Wed, 17 Feb 2010 06:04:36 -0500 Received: from qmta02.emeryville.ca.mail.comcast.net ([76.96.30.24]:44349 "EHLO qmta02.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755223Ab0BQLEf (ORCPT ); Wed, 17 Feb 2010 06:04:35 -0500 Received: from omta10.emeryville.ca.mail.comcast.net ([76.96.30.28]) by qmta02.emeryville.ca.mail.comcast.net with comcast id iz4c1d0020cQ2SLA2z4cLm; Wed, 17 Feb 2010 11:04:36 +0000 Received: from localhost.localdomain ([63.64.152.142]) by omta10.emeryville.ca.mail.comcast.net with comcast id iz4K1d00134bfcX8Wz4MYp; Wed, 17 Feb 2010 11:04:34 +0000 From: Jeff Kirsher Subject: [net-next-2.6 PATCH 12/18] igb: inline igb_maybe_stop_tx To: davem@davemloft.net Cc: netdev@vger.kernel.org, gospo@redhat.com, Nicholas Nunley , Jeff Kirsher Date: Wed, 17 Feb 2010 03:04:18 -0800 Message-ID: <20100217110416.17723.4456.stgit@localhost.localdomain> In-Reply-To: <20100217105953.17723.36633.stgit@localhost.localdomain> References: <20100217105953.17723.36633.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Nick Nunley igb_maybe_stop_tx() is extremely small and appears in several spots in the tx hotpath. This change inlines the function for a possible performance boost. Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher --- drivers/net/igb/igb_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index cba0115..a1fe581 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -3758,7 +3758,7 @@ static int __igb_maybe_stop_tx(struct igb_ring *tx_ring, int size) return 0; } -static int igb_maybe_stop_tx(struct igb_ring *tx_ring, int size) +static inline int igb_maybe_stop_tx(struct igb_ring *tx_ring, int size) { if (igb_desc_unused(tx_ring) >= size) return 0;