summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorYaniv Rosner <yanivr@broadcom.com>2011-08-02 23:00:06 +0000
committerDavid S. Miller <davem@davemloft.net>2011-08-03 03:22:18 -0700
commitafad009ad76ece72a3c9629bbc08f14459b9bba7 (patch)
treeae80656d12ddec7d9a2e1176348ad3ea0385f603 /drivers/net
parentd2059a061164120a1e44a0ca46fe08044d6d7c2d (diff)
downloadlinux-3.10-afad009ad76ece72a3c9629bbc08f14459b9bba7.tar.gz
linux-3.10-afad009ad76ece72a3c9629bbc08f14459b9bba7.tar.bz2
linux-3.10-afad009ad76ece72a3c9629bbc08f14459b9bba7.zip
bnx2x: Fix BCM578xx MAC test
Signed-off-by: Yaniv Rosner <yanivr@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/bnx2x/bnx2x_link.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c
index 5e6f3513862..01fb92c37a9 100644
--- a/drivers/net/bnx2x/bnx2x_link.c
+++ b/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);
}