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

Commit aabdd09d authored by Ivan Vecera's avatar Ivan Vecera Committed by David S. Miller
Browse files

tg3: Fix for disallow tx coalescing time to be 0 



The recent commit 087d7a8c "tg3: Fix for diasllow rx coalescing
time to be 0" disallow to set Rx coalescing time to be 0 as this stops
generating interrupts for the incoming packets. I found the zero
Tx coalescing time stops generating interrupts for outgoing packets
as well and fires Tx watchdog later. To avoid this, don't allow to set
Tx coalescing time to 0 and also remove subsequent checks that become
senseless.

Cc: satish.baddipadige@broadcom.com
Cc: siva.kallam@broadcom.com
Cc: michael.chan@broadcom.com
Signed-off-by: default avatarIvan Vecera <ivecera@redhat.com>
Acked-by: default avatarSiva Reddy Kallam <siva.kallam@broadcom.com>
Acked-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 561ed233

drivers/net/ethernet/broadcom/tg3.c

+1 −10
Original line number Diff line number Diff line
@@ -14012,6 +14012,7 @@ static int tg3_set_coalesce(struct net_device *dev, struct ethtool_coalesce *ec) 
	if ((ec->rx_coalesce_usecs > MAX_RXCOL_TICKS) ||

	    (!ec->rx_coalesce_usecs) ||

	    (ec->tx_coalesce_usecs > MAX_TXCOL_TICKS) ||

	    (!ec->tx_coalesce_usecs) ||

	    (ec->rx_max_coalesced_frames > MAX_RXMAX_FRAMES) ||

	    (ec->tx_max_coalesced_frames > MAX_TXMAX_FRAMES) ||

	    (ec->rx_coalesce_usecs_irq > max_rxcoal_tick_int) ||
@@ -14022,16 +14023,6 @@ static int tg3_set_coalesce(struct net_device *dev, struct ethtool_coalesce *ec) 
	    (ec->stats_block_coalesce_usecs < min_stat_coal_ticks))

		return -EINVAL;



	/* No rx interrupts will be generated if both are zero */

	if ((ec->rx_coalesce_usecs == 0) &&

	    (ec->rx_max_coalesced_frames == 0))

		return -EINVAL;



	/* No tx interrupts will be generated if both are zero */

	if ((ec->tx_coalesce_usecs == 0) &&

	    (ec->tx_max_coalesced_frames == 0))

		return -EINVAL;



	/* Only copy relevant parameters, ignore all others. */

	tp->coal.rx_coalesce_usecs = ec->rx_coalesce_usecs;

	tp->coal.tx_coalesce_usecs = ec->tx_coalesce_usecs;