From 0b898cf7f207519c7e737bcf5689dc4e225c0a84 Mon Sep 17 00:00:00 2001
From: Eilon Greenstein <eilong@broadcom.com>
Date: Wed, 14 Jan 2009 06:44:21 +0000
Subject: [PATCH] --- yaml --- r: 130123 b: refs/heads/master c:
 44722d1d216c9dd4536de5f88fe8320b07e68a96 h: refs/heads/master i:   130121:
 78c24f4692505e2d05206f642a0464ae2bbd1873   130119:
 457e54770ae651e4e453012067fe2e29e3612bd7 v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/net/bnx2x_link.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 099cc01b40dd..5c090f6d9a83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3858276b7198074bf3570470463808627f0c9e31
+refs/heads/master: 44722d1d216c9dd4536de5f88fe8320b07e68a96
diff --git a/trunk/drivers/net/bnx2x_link.c b/trunk/drivers/net/bnx2x_link.c
index 4ce107c125d1..2fd6be0cca13 100644
--- a/trunk/drivers/net/bnx2x_link.c
+++ b/trunk/drivers/net/bnx2x_link.c
@@ -3882,9 +3882,15 @@ static u8 bnx2x_link_initialize(struct link_params *params,
 	}
 
 	if (vars->phy_flags & PHY_XGXS_FLAG) {
-		if (params->req_line_speed &&
+		if ((params->req_line_speed &&
 		    ((params->req_line_speed == SPEED_100) ||
-		     (params->req_line_speed == SPEED_10))) {
+		     (params->req_line_speed == SPEED_10))) ||
+		    (!params->req_line_speed &&
+		     (params->speed_cap_mask >=
+		       PORT_HW_CFG_SPEED_CAPABILITY_D0_10M_FULL) &&
+		     (params->speed_cap_mask <
+		       PORT_HW_CFG_SPEED_CAPABILITY_D0_1G)
+		     ))  {
 			vars->phy_flags |= PHY_SGMII_FLAG;
 		} else {
 			vars->phy_flags &= ~PHY_SGMII_FLAG;