Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3791cdf authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Make 1000Base-X FC resolution look like 1000T 



This patch changes tg3's 1000Base-X flow control resolution to look like
the 1000Base-T flow control resolution code.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c796984f

drivers/net/ethernet/broadcom/tg3.c

+6 −12
Original line number Diff line number Diff line
@@ -1706,18 +1706,12 @@ static u8 tg3_resolve_flowctrl_1000X(u16 lcladv, u16 rmtadv) 
{

	u8 cap = 0;



	if (lcladv & ADVERTISE_1000XPAUSE) {

		if (lcladv & ADVERTISE_1000XPSE_ASYM) {

			if (rmtadv & LPA_1000XPAUSE)

	if (lcladv & rmtadv & ADVERTISE_1000XPAUSE) {

		cap = FLOW_CTRL_TX | FLOW_CTRL_RX;

			else if (rmtadv & LPA_1000XPAUSE_ASYM)

	} else if (lcladv & rmtadv & ADVERTISE_1000XPSE_ASYM) {

		if (lcladv & ADVERTISE_1000XPAUSE)

			cap = FLOW_CTRL_RX;

		} else {

			if (rmtadv & LPA_1000XPAUSE)

				cap = FLOW_CTRL_TX | FLOW_CTRL_RX;

		}

	} else if (lcladv & ADVERTISE_1000XPSE_ASYM) {

		if ((rmtadv & LPA_1000XPAUSE) && (rmtadv & LPA_1000XPAUSE_ASYM))

		if (rmtadv & ADVERTISE_1000XPAUSE)

			cap = FLOW_CTRL_TX;

	}