mirror of https://gitee.com/openkylin/linux.git
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: Ron Mercer <ron.mercer@qlogic.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
3e23b7d3b5
commit
ad4c9a09c7
|
@ -1456,16 +1456,11 @@ static void ql_phy_start_neg_ex(struct ql3_adapter *qdev)
|
|||
PHYAddr[qdev->mac_index]);
|
||||
reg &= ~PHY_GIG_ALL_PARAMS;
|
||||
|
||||
if(portConfiguration &
|
||||
PORT_CONFIG_FULL_DUPLEX_ENABLED &
|
||||
PORT_CONFIG_1000MB_SPEED) {
|
||||
reg |= PHY_GIG_ADV_1000F;
|
||||
}
|
||||
|
||||
if(portConfiguration &
|
||||
PORT_CONFIG_HALF_DUPLEX_ENABLED &
|
||||
PORT_CONFIG_1000MB_SPEED) {
|
||||
reg |= PHY_GIG_ADV_1000H;
|
||||
if(portConfiguration & PORT_CONFIG_1000MB_SPEED) {
|
||||
if(portConfiguration & PORT_CONFIG_FULL_DUPLEX_ENABLED)
|
||||
reg |= PHY_GIG_ADV_1000F;
|
||||
else
|
||||
reg |= PHY_GIG_ADV_1000H;
|
||||
}
|
||||
|
||||
ql_mii_write_reg_ex(qdev, PHY_GIG_CONTROL, reg,
|
||||
|
|
Loading…
Reference in New Issue