diff --git a/[refs] b/[refs] index e9a96f893b24..be19d938932e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a36f2efbf9ac5da1d08cb44d237ba35ec354888 +refs/heads/master: ed8680a7e68fc07d6b2bfa977e8f5f3d3c568d14 diff --git a/trunk/drivers/net/bnx2x_link.c b/trunk/drivers/net/bnx2x_link.c index 526072bb8087..b61a7a24ecc5 100644 --- a/trunk/drivers/net/bnx2x_link.c +++ b/trunk/drivers/net/bnx2x_link.c @@ -1753,7 +1753,7 @@ static u8 bnx2x_link_settings_status(struct link_params *params, return rc; } -static void bnx2x_set_sgmii_tx_driver(struct link_params *params) +static void bnx2x_set_gmii_tx_driver(struct link_params *params) { struct bnx2x *bp = params->bp; u16 lp_up2; @@ -4929,7 +4929,7 @@ static u8 bnx2x_update_link_up(struct link_params *params, if (gp_status & MDIO_AN_CL73_OR_37_COMPLETE) { if (!(vars->phy_flags & PHY_SGMII_FLAG)) - bnx2x_set_sgmii_tx_driver(params); + bnx2x_set_gmii_tx_driver(params); } }