From f56bdbcb9c7061c9627b3afcdd22e3701ae46346 Mon Sep 17 00:00:00 2001
From: Yaniv Rosner <yanivr@broadcom.com>
Date: Tue, 2 Aug 2011 23:00:06 +0000
Subject: [PATCH] --- yaml --- r: 262463 b: refs/heads/master c:
 afad009ad76ece72a3c9629bbc08f14459b9bba7 h: refs/heads/master i:   262461:
 6fade96cf9d2efca42e6b83c04c7d3a012c06308   262459:
 0495b9226a0029329026dedf4dd1c577ab56ca8b   262455:
 0f40a86ee1171be548b6570574b165dca45648a2   262447:
 162ad035fa439749384003ae61770ad074771d93   262431:
 bb23857d9d7d0a9c1682c0b876ca2b2f30a2e786   262399:
 96fae13f1b2d08e79dcc1b7c54186fd04131f185 v: v3

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

diff --git a/[refs] b/[refs]
index fa76e13863b8..bac8a403129d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2059a061164120a1e44a0ca46fe08044d6d7c2d
+refs/heads/master: afad009ad76ece72a3c9629bbc08f14459b9bba7
diff --git a/trunk/drivers/net/bnx2x/bnx2x_link.c b/trunk/drivers/net/bnx2x/bnx2x_link.c
index 5e6f3513862c..01fb92c37a9f 100644
--- a/trunk/drivers/net/bnx2x/bnx2x_link.c
+++ b/trunk/drivers/net/bnx2x/bnx2x_link.c
@@ -11541,13 +11541,12 @@ void bnx2x_init_xmac_loopback(struct link_params *params,
 	 * Set WC to loopback mode since link is required to provide clock
 	 * to the XMAC in 20G mode
 	 */
-	if (vars->line_speed == SPEED_20000) {
-		bnx2x_set_aer_mmd(params, &params->phy[0]);
-		bnx2x_warpcore_reset_lane(bp, &params->phy[0], 0);
-		params->phy[INT_PHY].config_loopback(
+	bnx2x_set_aer_mmd(params, &params->phy[0]);
+	bnx2x_warpcore_reset_lane(bp, &params->phy[0], 0);
+	params->phy[INT_PHY].config_loopback(
 			&params->phy[INT_PHY],
 			params);
-	}
+
 	bnx2x_xmac_enable(params, vars, 1);
 	REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + params->port*4, 0);
 }