Commit ad4c9a09 authored by Ron Mercer's avatar Ron Mercer Committed by Jeff Garzik

qla3xxx: bugfix: Fix bad logical operation in link state machine.

Luckily, this wasn't reported or reproduced. The logical operation for
setting duplex had wrong grouping.
Signed-off-by: default avatarRon Mercer <ron.mercer@qlogic.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 3e23b7d3
...@@ -1456,16 +1456,11 @@ static void ql_phy_start_neg_ex(struct ql3_adapter *qdev) ...@@ -1456,16 +1456,11 @@ static void ql_phy_start_neg_ex(struct ql3_adapter *qdev)
PHYAddr[qdev->mac_index]); PHYAddr[qdev->mac_index]);
reg &= ~PHY_GIG_ALL_PARAMS; reg &= ~PHY_GIG_ALL_PARAMS;
if(portConfiguration & if(portConfiguration & PORT_CONFIG_1000MB_SPEED) {
PORT_CONFIG_FULL_DUPLEX_ENABLED & if(portConfiguration & PORT_CONFIG_FULL_DUPLEX_ENABLED)
PORT_CONFIG_1000MB_SPEED) { reg |= PHY_GIG_ADV_1000F;
reg |= PHY_GIG_ADV_1000F; else
} reg |= PHY_GIG_ADV_1000H;
if(portConfiguration &
PORT_CONFIG_HALF_DUPLEX_ENABLED &
PORT_CONFIG_1000MB_SPEED) {
reg |= PHY_GIG_ADV_1000H;
} }
ql_mii_write_reg_ex(qdev, PHY_GIG_CONTROL, reg, ql_mii_write_reg_ex(qdev, PHY_GIG_CONTROL, reg,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment