diff options
author | Ingo Molnar | 2008-07-24 08:09:26 +0200 |
---|---|---|
committer | Ingo Molnar | 2008-07-24 08:09:26 +0200 |
commit | 28afe961a18f77b2249062499bdbf70fd2ec6bba (patch) | |
tree | 71a5cb32924b8c8256bbc0f2f81c6b8c2ac79108 /drivers/net/qla3xxx.c | |
parent | ftrace: only trace preempt off with preempt tracer (diff) | |
parent | Merge branch 'x86/auditsc' of git://git.kernel.org/pub/scm/linux/kernel/git/f... (diff) | |
download | kernel-qcow2-linux-28afe961a18f77b2249062499bdbf70fd2ec6bba.tar.gz kernel-qcow2-linux-28afe961a18f77b2249062499bdbf70fd2ec6bba.tar.xz kernel-qcow2-linux-28afe961a18f77b2249062499bdbf70fd2ec6bba.zip |
Merge branch 'linus' into tracing/urgent
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 bccee68bd48a..e7d48a352beb 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; } |