diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-08-03 11:56:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-03 11:56:19 -0700 |
| commit | cfaa21893bae71f527f751e056fb35ee1dabdec1 (patch) | |
| tree | b347afb8e9a916f51b03f006dada6fd242d86dc3 | |
| parent | bpf: fix method of PTR_TO_PACKET reg id generation (diff) | |
| parent | tg3: Report the correct number of RSS queues through tg3_get_rxnfc (diff) | |
| download | linux-dev-cfaa21893bae71f527f751e056fb35ee1dabdec1.tar.xz linux-dev-cfaa21893bae71f527f751e056fb35ee1dabdec1.zip | |
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: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index ff300f7cf529..659261218d9f 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -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) || |