From 684d33835258388a9117a776578a7fce25c146ed Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 12 Oct 2009 09:26:17 +0000 Subject: [PATCH] --- yaml --- r: 170667 b: refs/heads/master c: 767f4a7ca8041442e033dd919b591d00f6901e03 h: refs/heads/master i: 170665: daf189f132567a287a6b84b3f5228b6f79bbbfff 170663: 50dbe970bd7385e297935b784ba18b9e74e9c575 v: v3 --- [refs] | 2 +- trunk/drivers/net/mdio.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c0c5f10c0f43..e8f681559317 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be926fc4046913d9ad921aeacdf9329978241c38 +refs/heads/master: 767f4a7ca8041442e033dd919b591d00f6901e03 diff --git a/trunk/drivers/net/mdio.c b/trunk/drivers/net/mdio.c index 21f8754fcf4c..c0db9d753006 100644 --- a/trunk/drivers/net/mdio.c +++ b/trunk/drivers/net/mdio.c @@ -344,11 +344,9 @@ void mdio45_ethtool_spauseparam_an(const struct mdio_if_info *mdio, old_adv = mdio->mdio_read(mdio->dev, mdio->prtad, MDIO_MMD_AN, MDIO_AN_ADVERTISE); - adv = old_adv & ~(ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM); - if (ecmd->autoneg) - adv |= mii_advertise_flowctrl( - (ecmd->rx_pause ? FLOW_CTRL_RX : 0) | - (ecmd->tx_pause ? FLOW_CTRL_TX : 0)); + adv = ((old_adv & ~(ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM)) | + mii_advertise_flowctrl((ecmd->rx_pause ? FLOW_CTRL_RX : 0) | + (ecmd->tx_pause ? FLOW_CTRL_TX : 0))); if (adv != old_adv) { mdio->mdio_write(mdio->dev, mdio->prtad, MDIO_MMD_AN, MDIO_AN_ADVERTISE, adv);