From bddc5bc1d2322194c210c0f28f92a168180d5f7c Mon Sep 17 00:00:00 2001 From: Hiroaki SHIMODA Date: Tue, 22 Nov 2011 04:05:41 +0000 Subject: [PATCH] --- yaml --- r: 277917 b: refs/heads/master c: 202ff1c26c768efeead20b388556eda265dc8352 h: refs/heads/master i: 277915: bbc8374c6990481a1769b522998b094927c4be43 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/tg3.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ef544c09fae8..0535d84c2c51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 570e57bcbcc4df5581b1e9c806ab2b16e96ea7d3 +refs/heads/master: 202ff1c26c768efeead20b388556eda265dc8352 diff --git a/trunk/drivers/net/ethernet/broadcom/tg3.c b/trunk/drivers/net/ethernet/broadcom/tg3.c index d9e9c8c652c8..ff3c48a5e959 100644 --- a/trunk/drivers/net/ethernet/broadcom/tg3.c +++ b/trunk/drivers/net/ethernet/broadcom/tg3.c @@ -3594,7 +3594,7 @@ static int tg3_phy_autoneg_cfg(struct tg3 *tp, u32 advertise, u32 flowctrl) u32 val, new_adv; new_adv = ADVERTISE_CSMA; - new_adv |= ethtool_adv_to_mii_adv_t(advertise); + new_adv |= ethtool_adv_to_mii_adv_t(advertise) & ADVERTISE_ALL; new_adv |= tg3_advert_flowctrl_1000T(flowctrl); err = tg3_writephy(tp, MII_ADVERTISE, new_adv); @@ -3778,7 +3778,7 @@ static int tg3_copper_is_advertising_all(struct tg3 *tp, u32 mask) { u32 adv_reg, all_mask = 0; - all_mask = ethtool_adv_to_mii_adv_t(mask); + all_mask = ethtool_adv_to_mii_adv_t(mask) & ADVERTISE_ALL; if (tg3_readphy(tp, MII_ADVERTISE, &adv_reg)) return 0; @@ -13199,8 +13199,7 @@ static u32 __devinit tg3_read_otp_phycfg(struct tg3 *tp) static void __devinit tg3_phy_init_link_config(struct tg3 *tp) { - u32 adv = ADVERTISED_Autoneg | - ADVERTISED_Pause; + u32 adv = ADVERTISED_Autoneg; if (!(tp->phy_flags & TG3_PHYFLG_10_100_ONLY)) adv |= ADVERTISED_1000baseT_Half |