From patchwork Tue Aug 3 15:57:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 60777 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 02E9CB6EFF for ; Wed, 4 Aug 2010 01:58:26 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756679Ab0HCP6V (ORCPT ); Tue, 3 Aug 2010 11:58:21 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:39480 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755952Ab0HCP6U (ORCPT ); Tue, 3 Aug 2010 11:58:20 -0400 Received: by yxg6 with SMTP id 6so1642746yxg.19 for ; Tue, 03 Aug 2010 08:58:20 -0700 (PDT) Received: by 10.100.128.15 with SMTP id a15mr8461526and.67.1280851072100; Tue, 03 Aug 2010 08:57:52 -0700 (PDT) Received: from arkham.kudzu.us (cpe-72-177-2-76.austin.res.rr.com [72.177.2.76]) by mx.google.com with ESMTPS id 34sm6776846ibi.6.2010.08.03.08.57.48 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 03 Aug 2010 08:57:51 -0700 (PDT) Received: by arkham.kudzu.us (sSMTP sendmail emulation); Tue, 03 Aug 2010 10:57:58 -0500 From: Jon Mason To: Jeff Kirsher , Jesse Brandeburg , Bruce Allan , Alex Duyck , PJ Waskiewicz , John Ronciak Cc: David Miller , netdev@vger.kernel.org, e1000-devel@lists.sourceforge.net Subject: [PATCH] ixgbe: ixgbe_fcoe build break Date: Tue, 3 Aug 2010 10:57:58 -0500 Message-Id: <1280851078-4263-1-git-send-email-jon.mason@exar.com> X-Mailer: git-send-email 1.7.0.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org struct ixgbe_fcoe has fields that are #ifdef'ed with CONFIG_IXGBE_DCB. However, not all references to those fields check for CONFIG_IXGBE_DCB. This patch adds the necessary check to allow for ixgbe to compile. Signed-off-by: Jon Mason --- drivers/net/ixgbe/ixgbe_main.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 7d6a415..9ec3dfe 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -6155,9 +6155,11 @@ static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb) txq &= (adapter->ring_feature[RING_F_FCOE].indices - 1); txq += adapter->ring_feature[RING_F_FCOE].mask; return txq; +#ifdef CONFIG_IXGBE_DCB } else if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) { txq = adapter->fcoe.up; return txq; +#endif } } #endif @@ -6218,8 +6220,10 @@ static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb, skb->protocol == htons(ETH_P_FIP))) { tx_flags &= ~(IXGBE_TX_FLAGS_VLAN_PRIO_MASK << IXGBE_TX_FLAGS_VLAN_SHIFT); +#ifdef CONFIG_IXGBE_DCB tx_flags |= ((adapter->fcoe.up << 13) << IXGBE_TX_FLAGS_VLAN_SHIFT); +#endif /* flag for FCoE offloads */ if (skb->protocol == htons(ETH_P_FCOE)) tx_flags |= IXGBE_TX_FLAGS_FCOE;