diff options
| author |   Ron Mercer <ron.mercer@qlogic.com> | 2007-11-07 13:59:07 -0800 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2007-11-10 04:25:15 -0500 |
| commit | ad4c9a09c7bf6aaa418679f0fb48484eab53a285 (patch) | |
| tree | 4ddef4582e16be7d12e3aa037842f91d2431b589 | |
| parent | qla3xxx: bugfix: Move link state machine into a worker thread (diff) | |
| download | linux-dev-ad4c9a09c7bf6aaa418679f0fb48484eab53a285.tar.xz linux-dev-ad4c9a09c7bf6aaa418679f0fb48484eab53a285.zip | |
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>
| -rw-r--r-- | drivers/net/qla3xxx.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c index 4f0fd41dce19..a5791114b7bd 100644 --- a/drivers/net/qla3xxx.c +++ b/drivers/net/qla3xxx.c @@ -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, |