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

Commit cfaa2189 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'tg3-fixes' 



Siva Reddy Kallam says:

====================
tg3: Disallow 0 rx coalesce time and correctly report RSS queues in tg3_get_rxnfc

First patch:
        Diasllow rx coalescing time to be 0

Second patch:
        Report the correct number of RSS queues through tg3_get_rxnfc
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1f415a74 9ce6fd7a

drivers/net/ethernet/broadcom/tg3.c

+1 −4
Original line number Diff line number Diff line
@@ -12552,10 +12552,6 @@ static int tg3_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info, 
				info->data = TG3_RSS_MAX_NUM_QS;

		}



		/* The first interrupt vector only

		 * handles link interrupts.

		 */

		info->data -= 1;

		return 0;



	default:
@@ -14014,6 +14010,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->rx_max_coalesced_frames > MAX_RXMAX_FRAMES) ||

	    (ec->tx_max_coalesced_frames > MAX_TXMAX_FRAMES) ||