From: Dmitry Kravkov <dmitry@broadcom.com>
Date: Sat, 16 Jul 2011 20:35:51 +0000 (-0700)
Subject: bnx2x: Fix compilation when CNIC is not selected in config
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~606
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1269c8d58529e0c7178d64d7caee3d48c0d687e6;p=users%2Fjedix%2Flinux-maple.git

bnx2x: Fix compilation when CNIC is not selected in config

Reported-by:  Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit faa2831445cdc95774584045fe10f749fa62244e)

Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c
index 54c8cff59e2cf..0ddc55a08174f 100644
--- a/drivers/net/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/bnx2x/bnx2x_cmn.c
@@ -1401,8 +1401,8 @@ void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw)
 
 u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb)
 {
-#ifdef BCM_CNIC
 	struct bnx2x *bp = netdev_priv(dev);
+#ifdef BCM_CNIC
 	if (NO_FCOE(bp))
 		return skb_tx_hash(dev, skb);
 	else {