From 81807dc3a4766eec406511a5e36d4b793cf71c3b Mon Sep 17 00:00:00 2001
From: Ariel Elior <ariele@broadcom.com>
Date: Mon, 11 Mar 2013 05:17:44 +0000
Subject: [PATCH] --- yaml --- r: 368215 b: refs/heads/master c:
 3786b9426d943ef167575be2ba20dab3d858243e h: refs/heads/master i:   368213:
 b1e00eb83f3ed11626c5a10c2f907f529f7dd896   368211:
 74311d428f00f27ee660ba680129447f403e7bbc   368207:
 49775418312d839b3350464efa696c80cb5fc90a v: v3

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

diff --git a/[refs] b/[refs]
index 0a5e2748668f..47fc6cf9619f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f22fdf25f4d4e9a2124ca6a2521f36dd73a32dad
+refs/heads/master: 3786b9426d943ef167575be2ba20dab3d858243e
diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 82f2e963782b..423b5a074c80 100644
--- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -11060,6 +11060,9 @@ static int bnx2x_get_hwinfo(struct bnx2x *bp)
 				} else
 					BNX2X_DEV_INFO("illegal OV for SD\n");
 				break;
+			case SHARED_FEAT_CFG_FORCE_SF_MODE_FORCED_SF:
+				bp->mf_config[vn] = 0;
+				break;
 			default:
 				/* Unknown configuration: reset mf_config */
 				bp->mf_config[vn] = 0;