From b9a9abae5f1af6f7b361eebb31274774e8ebd8a0 Mon Sep 17 00:00:00 2001 From: Yaniv Rosner Date: Thu, 5 Nov 2009 19:18:32 +0200 Subject: [PATCH] --- yaml --- r: 171172 b: refs/heads/master c: 0c786f0246951fdd9b206249aab9601fb788f9e4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2x_link.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4e9d5ad23ff9..93bf7e0934cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46d15cc7a09d6a7f96908b2cd812744c483893b4 +refs/heads/master: 0c786f0246951fdd9b206249aab9601fb788f9e4 diff --git a/trunk/drivers/net/bnx2x_link.c b/trunk/drivers/net/bnx2x_link.c index d2c9e19bcd5a..41b9b7bd3d8e 100644 --- a/trunk/drivers/net/bnx2x_link.c +++ b/trunk/drivers/net/bnx2x_link.c @@ -6322,10 +6322,11 @@ static u8 bnx2x_update_link_up(struct link_params *params, bnx2x_bmac_enable(params, vars, 0); bnx2x_set_led(params, LED_MODE_OPER, SPEED_10000); } else { - bnx2x_emac_enable(params, vars, 0); rc = bnx2x_emac_program(params, vars->line_speed, vars->duplex); + bnx2x_emac_enable(params, vars, 0); + /* AN complete? */ if (gp_status & MDIO_AN_CL73_OR_37_COMPLETE) { if (!(vars->phy_flags &