From patchwork Fri Nov 20 07:07:58 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: 38899 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 738091007D2 for ; Fri, 20 Nov 2009 18:09:24 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756965AbZKTHIO (ORCPT ); Fri, 20 Nov 2009 02:08:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757151AbZKTHIM (ORCPT ); Fri, 20 Nov 2009 02:08:12 -0500 Received: from qmta05.emeryville.ca.mail.comcast.net ([76.96.30.48]:50070 "EHLO QMTA05.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755833AbZKTHIJ (ORCPT ); Fri, 20 Nov 2009 02:08:09 -0500 Received: from OMTA06.emeryville.ca.mail.comcast.net ([76.96.30.51]) by QMTA05.emeryville.ca.mail.comcast.net with comcast id 7K4c1d00416AWCUA5K8Gix; Fri, 20 Nov 2009 07:08:16 +0000 Received: from localhost.localdomain ([63.64.152.142]) by OMTA06.emeryville.ca.mail.comcast.net with comcast id 7K7z1d00L34bfcX8SK82Nb; Fri, 20 Nov 2009 07:08:14 +0000 From: Jeff Kirsher Subject: [net-2.6 PATCH] ixgbe: fix compile warning without DCB To: davem@davemloft.net Cc: netdev@vger.kernel.org, gospo@redhat.com, Jeff Kirsher , Peter P Waskiewicz Jr Date: Thu, 19 Nov 2009 23:07:58 -0800 Message-ID: <20091120070745.30460.28687.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 When DCB is disabled, gcc warns about an unused varaible. Fixed by making the variable only available when DCB is enabled. Signed-off-by: Jeff Kirsher Acked-by: Peter P Waskiewicz Jr --- drivers/net/ixgbe/ixgbe_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 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/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index a5036f7..7cc6e93 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -240,7 +240,9 @@ static void ixgbe_unmap_and_free_tx_resource(struct ixgbe_adapter *adapter, static inline bool ixgbe_tx_is_paused(struct ixgbe_adapter *adapter, struct ixgbe_ring *tx_ring) { +#ifdef CONFIG_IXGBE_DCB int tc; +#endif u32 txoff = IXGBE_TFCS_TXOFF; #ifdef CONFIG_IXGBE_DCB