diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-13 01:19:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-13 01:19:43 -0700 |
| commit | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (patch) | |
| tree | 4f583715a29ac95723b85532f47c3c568a544f1d /drivers/net/qla3xxx.c | |
| parent | 7ef43ebaa538e0cc9063cbf84593a05091bcace2 (diff) | |
| parent | 7d2e3cb7000b883a8e489485ac249be572fe17b1 (diff) | |
Merge branch 'upstream-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/qla3xxx.c')
| -rw-r--r-- | drivers/net/qla3xxx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c index b7f7b2227d56..5f608780c3e8 100644 --- a/drivers/net/qla3xxx.c +++ b/drivers/net/qla3xxx.c @@ -1437,9 +1437,9 @@ static void ql_phy_start_neg_ex(struct ql3_adapter *qdev) reg &= ~PHY_GIG_ALL_PARAMS; if(portConfiguration & PORT_CONFIG_1000MB_SPEED) { - if(portConfiguration & PORT_CONFIG_FULL_DUPLEX_ENABLED) + if(portConfiguration & PORT_CONFIG_FULL_DUPLEX_ENABLED) reg |= PHY_GIG_ADV_1000F; - else + else reg |= PHY_GIG_ADV_1000H; } |