From 7a2c6b070363fd490df0f09039ed6ab32d9db697 Mon Sep 17 00:00:00 2001
From: Benjamin Li <benli@broadcom.com>
Date: Fri, 8 Jan 2010 00:51:21 -0800
Subject: [PATCH] --- yaml --- r: 183471 b: refs/heads/master c:
 e2eb8e38592f28d8be4a518f44d3385272dedddb h: refs/heads/master i:   183469:
 3a8eb3081aa41bf6d7cb640b9663d4d485784275   183467:
 b6b9b0e5aff84c1d960ee215d2664d2af026ffcf   183463:
 e4f37fc188d69a0138f3badca5b56184a63d59d7   183455:
 49e55b8cc200a0327f4636b5ac1e6c0daaba393c v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/bnx2.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1a3a88534677..535d3f523841 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 368c0ca2f0a69b0818fbc1796d8e21ff02a61b4c
+refs/heads/master: e2eb8e38592f28d8be4a518f44d3385272dedddb
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
index 65df1de447e4..b1c20e5f7de8 100644
--- a/trunk/drivers/net/bnx2.c
+++ b/trunk/drivers/net/bnx2.c
@@ -6145,6 +6145,10 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs)
 	REG_WR(bp, BNX2_PCI_MSIX_TBL_OFF_BIR, BNX2_PCI_GRC_WINDOW2_BASE);
 	REG_WR(bp, BNX2_PCI_MSIX_PBA_OFF_BIT, BNX2_PCI_GRC_WINDOW3_BASE);
 
+	/*  Need to flush the previous three writes to ensure MSI-X
+	 *  is setup properly */
+	REG_RD(bp, BNX2_PCI_MSIX_CONTROL);
+
 	for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) {
 		msix_ent[i].entry = i;
 		msix_ent[i].vector = 0;