aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom
diff options
context:
space:
mode:
authorYaniv Rosner <yanivr@broadcom.com>2012-11-26 22:46:36 -0500
committerDavid S. Miller <davem@davemloft.net>2012-11-28 10:59:22 -0500
commitfd5dfca79aad4b3eb86a07949c2949008647cd2c (patch)
tree2c6de6dd1da84149ceea9c35702593ed89ffabbc /drivers/net/ethernet/broadcom
parent52160da71abcd6fed96b06f40badbb7cf6173e45 (diff)
bnx2x: Change duplex setting in EEE function
This is not a real problem, since the EEE is supported for devices where the actual_phy_selection is zero, such that the req_duplex of params will match the one of the phy struct. 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/ethernet/broadcom')
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index ebab35d1309d..3e7d8246c501 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -10119,7 +10119,7 @@ static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,
10119 return rc; 10119 return rc;
10120 } 10120 }
10121 10121
10122 if ((params->req_duplex[actual_phy_selection] == DUPLEX_FULL) && 10122 if ((phy->req_duplex == DUPLEX_FULL) &&
10123 (params->eee_mode & EEE_MODE_ADV_LPI) && 10123 (params->eee_mode & EEE_MODE_ADV_LPI) &&
10124 (bnx2x_eee_calc_timer(params) || 10124 (bnx2x_eee_calc_timer(params) ||
10125 !(params->eee_mode & EEE_MODE_ENABLE_LPI))) 10125 !(params->eee_mode & EEE_MODE_ENABLE_LPI)))
@@ -13451,7 +13451,7 @@ static void bnx2x_check_kr2_wa(struct link_params *params,
13451 if (!(vars->link_attr_sync & LINK_ATTR_SYNC_KR2_ENABLE)) { 13451 if (!(vars->link_attr_sync & LINK_ATTR_SYNC_KR2_ENABLE)) {
13452 if (!not_kr2_device) { 13452 if (!not_kr2_device) {
13453 DP(NETIF_MSG_LINK, "BP=0x%x, NP=0x%x\n", base_page, 13453 DP(NETIF_MSG_LINK, "BP=0x%x, NP=0x%x\n", base_page,
13454 next_page); 13454 next_page);
13455 bnx2x_kr2_recovery(params, vars, phy); 13455 bnx2x_kr2_recovery(params, vars, phy);
13456 } 13456 }
13457 return; 13457 return;