From f3839349fea2378e3ba7dc2e2f8fe85b429408e2 Mon Sep 17 00:00:00 2001
From: Dmitry Kravkov <dmitry@broadcom.com>
Date: Sat, 16 Jul 2011 13:35:51 -0700
Subject: [PATCH] --- yaml --- r: 256482 b: refs/heads/master c:
 faa2831445cdc95774584045fe10f749fa62244e h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/bnx2x/bnx2x_cmn.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e1a0a83002ef..7e51a2d4f449 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d9a8db54c4b1e206adb3b7942aefd544306560f
+refs/heads/master: faa2831445cdc95774584045fe10f749fa62244e
diff --git a/trunk/drivers/net/bnx2x/bnx2x_cmn.c b/trunk/drivers/net/bnx2x/bnx2x_cmn.c
index e5fac6244f4a..b05ce9306dea 100644
--- a/trunk/drivers/net/bnx2x/bnx2x_cmn.c
+++ b/trunk/drivers/net/bnx2x/bnx2x_cmn.c
@@ -1403,8 +1403,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 {