Commit 2bd3ed04 authored Jun 09, 2008 by Matt Carlson Committed by David S. Miller Jun 09, 2008

tg3: Fix 5714S / 5715S / 5780S link failures



The git commit ef167e27 entitled
"Fix supporting flowctrl code" introduced a bug that prevents 5714S,
5715S and 5780S devices from falling back to a forced link mode.  The
problem is that the added flow control check will always fail if flow
control is set to autoneg and either RX or TX (or both) flow control
is enabled.  The driver defaults to setting flow control to autoneg
and advertises both RX and TX flow control.

The fix is to remove the errant check.

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent b6b16196

drivers/net/tg3.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -3168,8 +3168,7 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, int force_reset)
		err \|= tg3_readphy(tp, MII_BMCR, &bmcr);

		if ((tp->link_config.autoneg == AUTONEG_ENABLE) && !force_reset &&
		(tp->tg3_flags2 & TG3_FLG2_PARALLEL_DETECT) &&
		tp->link_config.flowctrl == tp->link_config.active_flowctrl) {
		(tp->tg3_flags2 & TG3_FLG2_PARALLEL_DETECT)) {
		/* do nothing, just check for link up at the end */
		} else if (tp->link_config.autoneg == AUTONEG_ENABLE) {
		u32 adv, new_adv;

Admin message