From: Yaniv Rosner Date: Wed, 15 Feb 2012 02:10:26 +0000 (+0000) Subject: bnx2x: force 10G on 84833 phy should be autoneg with only 10G advertised X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~482 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a1f9e96226053aa161f98893673848a613c75832;p=users%2Fjedix%2Flinux-maple.git bnx2x: force 10G on 84833 phy should be autoneg with only 10G advertised (cherry picked from commit 817a8aa8cfa1ebfb7bf27afb53ebb1ec3d49b564) Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller Signed-off-by: Joe Jin --- diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c index 0dd99a1ddbe6c..ef1a0bb839eeb 100644 --- a/drivers/net/bnx2x/bnx2x_link.c +++ b/drivers/net/bnx2x/bnx2x_link.c @@ -9482,13 +9482,8 @@ static int bnx2x_848xx_cmn_config_init(struct bnx2x_phy *phy, { struct bnx2x *bp = params->bp; u16 autoneg_val, an_1000_val, an_10_100_val, an_10g_val; - u16 tmp_req_line_speed; - tmp_req_line_speed = phy->req_line_speed; - if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) { - if (phy->req_line_speed == SPEED_10000) - phy->req_line_speed = SPEED_AUTO_NEG; - } else { + if (phy->type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) { /* Save spirom version */ bnx2x_save_848xx_spirom_version(phy, bp, params->port); } @@ -9632,8 +9627,6 @@ static int bnx2x_848xx_cmn_config_init(struct bnx2x_phy *phy, MDIO_AN_REG_8481_10GBASE_T_AN_CTRL, 1); - phy->req_line_speed = tmp_req_line_speed; - return 0; }