From fff71feae9730c93553dfb8d02365726a676528e Mon Sep 17 00:00:00 2001 From: Ron Mercer Date: Wed, 7 Nov 2007 13:59:07 -0800 Subject: [PATCH] --- yaml --- r: 73465 b: refs/heads/master c: ad4c9a09c7bf6aaa418679f0fb48484eab53a285 h: refs/heads/master i: 73463: 15211ed973cef75ebd393e46808214567d163888 v: v3 --- [refs] | 2 +- trunk/drivers/net/qla3xxx.c | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index c53016173021..51b15eee721e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e23b7d3b54c07f1c4fee1ebc418d1a37248654e +refs/heads/master: ad4c9a09c7bf6aaa418679f0fb48484eab53a285 diff --git a/trunk/drivers/net/qla3xxx.c b/trunk/drivers/net/qla3xxx.c index 4f0fd41dce19..a5791114b7bd 100644 --- a/trunk/drivers/net/qla3xxx.c +++ b/trunk/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,