[PATCH net 1/5] bnx2x: init FCOE FP only once

From: Vladislav Zolotarov <redacted>


Signed-off-by: Dmitry Kravkov <redacted>
Signed-off-by: Eilon Greenstein <redacted>
---
 drivers/net/bnx2x/bnx2x_cmn.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c
index d724a18..64df0ef 100644
--- a/drivers/net/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/bnx2x/bnx2x_cmn.c

@@ -63,8 +63,9 @@ static inline void bnx2x_bz_fp(struct bnx2x *bp, int index)
 	fp->disable_tpa = ((bp->flags & TPA_ENABLE_FLAG) == 0);
 
 #ifdef BCM_CNIC
-	/* We don't want TPA on FCoE, FWD and OOO L2 rings */
-	bnx2x_fcoe(bp, disable_tpa) = 1;
+	/* We don't want TPA on an FCoE L2 ring */
+	if (IS_FCOE_FP(fp))
+		fp->disable_tpa = 1;
 #endif
 }
 

-- 
1.7.2.2

From: "Dmitry Kravkov" <redacted>
Date: Tue, 9 Aug 2011 16:08:09 +0300

From: Vladislav Zolotarov <redacted>


Signed-off-by: Dmitry Kravkov <redacted>
Signed-off-by: Eilon Greenstein <redacted>

Applied.