Commit 44c22ee9 authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

mii: Simplify mii_resolve_flowctrl_fdx() 



This is a shorter and more comprehensible formulation of the
conditions for each flow control mode.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 40239396

include/linux/mii.h

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

	u8 cap = 0;



	if (lcladv & ADVERTISE_PAUSE_CAP) {

		if (lcladv & ADVERTISE_PAUSE_ASYM) {

			if (rmtadv & LPA_PAUSE_CAP)

	if (lcladv & rmtadv & ADVERTISE_PAUSE_CAP) {

		cap = FLOW_CTRL_TX | FLOW_CTRL_RX;

			else if (rmtadv & LPA_PAUSE_ASYM)

	} else if (lcladv & rmtadv & ADVERTISE_PAUSE_ASYM) {

		if (lcladv & ADVERTISE_PAUSE_CAP)

			cap = FLOW_CTRL_RX;

		} else {

			if (rmtadv & LPA_PAUSE_CAP)

				cap = FLOW_CTRL_TX | FLOW_CTRL_RX;

		}

	} else if (lcladv & ADVERTISE_PAUSE_ASYM) {

		if ((rmtadv & LPA_PAUSE_CAP) && (rmtadv & LPA_PAUSE_ASYM))

		else if (rmtadv & ADVERTISE_PAUSE_CAP)

			cap = FLOW_CTRL_TX;

	}