From 55f553306dec8ce19f1e68dbed0e85fe7b85cba7 Mon Sep 17 00:00:00 2001
From: Eilon Greenstein <eilong@broadcom.com>
Date: Mon, 3 Nov 2008 16:45:55 -0800
Subject: [PATCH] --- yaml --- r: 118411 b: refs/heads/master c:
 9a0354405feb0f8bd460349a93db05e4cca8d166 h: refs/heads/master i:   118409:
 2a70ec56e519a5cf5c71598fa3402161627367d2   118407:
 d2248c6e73aba9a8b0bd3034bcec76b9de82076c v: v3

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

diff --git a/[refs] b/[refs]
index ff6d859cc45e..49f11e8b9b07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee04448d8871e71f55520d62cf6adbf5dd403c99
+refs/heads/master: 9a0354405feb0f8bd460349a93db05e4cca8d166
diff --git a/trunk/drivers/net/bnx2x_main.c b/trunk/drivers/net/bnx2x_main.c
index fce745148ff9..61152e149e67 100644
--- a/trunk/drivers/net/bnx2x_main.c
+++ b/trunk/drivers/net/bnx2x_main.c
@@ -6481,6 +6481,7 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
 	bnx2x_free_irq(bp);
 load_error:
 	bnx2x_free_mem(bp);
+	bp->port.pmf = 0;
 
 	/* TBD we really need to reset the chip
 	   if we want to recover from this */
@@ -6791,6 +6792,7 @@ static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)
 	/* Report UNLOAD_DONE to MCP */
 	if (!BP_NOMCP(bp))
 		bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_DONE);
+	bp->port.pmf = 0;
 
 	/* Free SKBs, SGEs, TPA pool and driver internals */
 	bnx2x_free_skbs(bp);