diff options
| author | Michael Chan <mchan@broadcom.com> | 2016-02-19 19:43:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-19 23:39:32 -0500 |
| commit | de73018fb5474b33dc4f6d6b8d889e40232e325b (patch) | |
| tree | c5df1505cf05f44a360f955ca420c28d9f296e2c | |
| parent | 035a1539ab63bfdb284bdf6e8459e35897c60564 (diff) | |
| download | linux-de73018fb5474b33dc4f6d6b8d889e40232e325b.tar.gz linux-de73018fb5474b33dc4f6d6b8d889e40232e325b.tar.bz2 linux-de73018fb5474b33dc4f6d6b8d889e40232e325b.zip | |
bnxt_en: Remove unnecessary call to update PHY settings.
Fix bnxt_update_phy_setting() to check the correct parameters when
determining whether to update the PHY. Requested line speed/duplex should
only be checked for forced speed mode. This avoids unnecessary link
interruptions when loading the driver.
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 9b560582c7e6..78f6b5a2b6a0 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -4554,20 +4554,18 @@ static int bnxt_update_phy_setting(struct bnxt *bp) if (!(link_info->autoneg & BNXT_AUTONEG_FLOW_CTRL) && link_info->force_pause_setting != link_info->req_flow_ctrl) update_pause = true; - if (link_info->req_duplex != link_info->duplex_setting) - update_link = true; if (!(link_info->autoneg & BNXT_AUTONEG_SPEED)) { if (BNXT_AUTO_MODE(link_info->auto_mode)) update_link = true; if (link_info->req_link_speed != link_info->force_link_speed) update_link = true; + if (link_info->req_duplex != link_info->duplex_setting) + update_link = true; } else { if (link_info->auto_mode == BNXT_LINK_AUTO_NONE) update_link = true; if (link_info->advertising != link_info->auto_link_speeds) update_link = true; - if (link_info->req_link_speed != link_info->auto_link_speed) - update_link = true; } if (update_link) |