From patchwork Fri Dec 26 23:14:23 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 15746 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 DD28BDDD1B for ; Sat, 27 Dec 2008 12:32:12 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752443AbYLZXOW (ORCPT ); Fri, 26 Dec 2008 18:14:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752374AbYLZXOW (ORCPT ); Fri, 26 Dec 2008 18:14:22 -0500 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:40795 "EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752164AbYLZXOV (ORCPT ); Fri, 26 Dec 2008 18:14:21 -0500 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id 3177CC8C17F; Fri, 26 Dec 2008 15:14:24 -0800 (PST) Date: Fri, 26 Dec 2008 15:14:23 -0800 (PST) Message-Id: <20081226.151423.241809329.davem@davemloft.net> To: jeffrey.t.kirsher@intel.com CC: netdev@vger.kernel.org Subject: [PATCH] igb: Fix build warning when DCA is disabled. From: David Miller X-Mailer: Mew version 6.1 on Emacs 22.1 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org I just pushed the following to net-next-2.6 igb: Fix build warning when DCA is disabled. Signed-off-by: David S. Miller --- drivers/net/igb/igb_main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 9331e52..022794e 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -3379,7 +3379,6 @@ static void igb_write_itr(struct igb_ring *ring) static irqreturn_t igb_msix_rx(int irq, void *data) { struct igb_ring *rx_ring = data; - struct igb_adapter *adapter = rx_ring->adapter; /* Write the ITR value calculated at the end of the * previous interrupt. @@ -3391,7 +3390,7 @@ static irqreturn_t igb_msix_rx(int irq, void *data) __netif_rx_schedule(&rx_ring->napi); #ifdef CONFIG_IGB_DCA - if (adapter->flags & IGB_FLAG_DCA_ENABLED) + if (rx_ring->adapter->flags & IGB_FLAG_DCA_ENABLED) igb_update_rx_dca(rx_ring); #endif return IRQ_HANDLED;