From patchwork Fri Sep 25 22:19:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 34320 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 2CF92B7BCE for ; Sat, 26 Sep 2009 08:20:25 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753007AbZIYWTl (ORCPT ); Fri, 25 Sep 2009 18:19:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752884AbZIYWTl (ORCPT ); Fri, 25 Sep 2009 18:19:41 -0400 Received: from qmta04.westchester.pa.mail.comcast.net ([76.96.62.40]:48124 "EHLO QMTA04.westchester.pa.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752875AbZIYWTl (ORCPT ); Fri, 25 Sep 2009 18:19:41 -0400 Received: from OMTA07.westchester.pa.mail.comcast.net ([76.96.62.59]) by QMTA04.westchester.pa.mail.comcast.net with comcast id kyCB1c0031GhbT854AKlBk; Fri, 25 Sep 2009 22:19:45 +0000 Received: from localhost.localdomain ([72.254.87.24]) by OMTA07.westchester.pa.mail.comcast.net with comcast id lAKQ1c00T0XWpyY3TAKTNz; Fri, 25 Sep 2009 22:19:43 +0000 From: Jeff Kirsher Subject: [net-2.6 PATCH 09/13] e1000: drop redunant line of code, cleanup To: davem@davemloft.net Cc: netdev@vger.kernel.org, gospo@redhat.com, Jesse Brandeburg , Don Skidmore , Jeff Kirsher Date: Fri, 25 Sep 2009 15:19:23 -0700 Message-ID: <20090925221923.26715.61459.stgit@localhost.localdomain> In-Reply-To: <20090925221613.26715.66796.stgit@localhost.localdomain> References: <20090925221613.26715.66796.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: Jesse Brandeburg adapter was being assigned twice, also clarified variable name and unwrapped line. Signed-off-by: Jesse Brandeburg Signed-off-by: Don Skidmore Signed-off-by: Jeff Kirsher --- drivers/net/e1000/e1000_main.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 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/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 2178e0d..d7dea69 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -3394,17 +3394,13 @@ static irqreturn_t e1000_intr(int irq, void *data) static int e1000_clean(struct napi_struct *napi, int budget) { struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi); - struct net_device *poll_dev = adapter->netdev; - int tx_cleaned = 0, work_done = 0; + int tx_clean_complete = 0, work_done = 0; - adapter = netdev_priv(poll_dev); + tx_clean_complete = e1000_clean_tx_irq(adapter, &adapter->tx_ring[0]); - tx_cleaned = e1000_clean_tx_irq(adapter, &adapter->tx_ring[0]); + adapter->clean_rx(adapter, &adapter->rx_ring[0], &work_done, budget); - adapter->clean_rx(adapter, &adapter->rx_ring[0], - &work_done, budget); - - if (!tx_cleaned) + if (!tx_clean_complete) work_done = budget; /* If budget not fully consumed, exit the polling mode */