Commit 2b474cf5 authored by Gary Zambrano's avatar Gary Zambrano Committed by Jeff Garzik
Browse files

[PATCH] b44: disable default tx pause 



Disable default tx pause frame support.
The b44 controller has a bug that generates excessive tx pause
frames.

Signed-off-by: default avatarGary Zambrano <zambrano@broadcom.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 4be5de25

drivers/net/b44.c

+12 −19
Original line number Diff line number Diff line
@@ -410,25 +410,18 @@ static void __b44_set_flow_ctrl(struct b44 *bp, u32 pause_flags) 


static void b44_set_flow_ctrl(struct b44 *bp, u32 local, u32 remote)

{

	u32 pause_enab = bp->flags & (B44_FLAG_TX_PAUSE |

				      B44_FLAG_RX_PAUSE);



	if (local & ADVERTISE_PAUSE_CAP) {

		if (local & ADVERTISE_PAUSE_ASYM) {

			if (remote & LPA_PAUSE_CAP)

				pause_enab |= (B44_FLAG_TX_PAUSE |

					       B44_FLAG_RX_PAUSE);

			else if (remote & LPA_PAUSE_ASYM)

	u32 pause_enab = 0; 



	/* The driver supports only rx pause by default because

	   the b44 mac tx pause mechanism generates excessive 

	   pause frames. 	   

	   Use ethtool to turn on b44 tx pause if necessary.

	 */

	if ((local & ADVERTISE_PAUSE_CAP) &&

	    (local & ADVERTISE_PAUSE_ASYM)){ 

		if ((remote & LPA_PAUSE_ASYM) &&

		    !(remote & LPA_PAUSE_CAP))

			pause_enab |= B44_FLAG_RX_PAUSE;

		} else {

			if (remote & LPA_PAUSE_CAP)

				pause_enab |= (B44_FLAG_TX_PAUSE |

					       B44_FLAG_RX_PAUSE);

		}

	} else if (local & ADVERTISE_PAUSE_ASYM) {

		if ((remote & LPA_PAUSE_CAP) &&

		    (remote & LPA_PAUSE_ASYM))

			pause_enab |= B44_FLAG_TX_PAUSE;

	}



	__b44_set_flow_ctrl(bp, pause_enab);