diff options
| author | Ingo Molnar | 2019-06-24 19:19:53 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2019-06-24 19:19:53 +0200 |
| commit | d2abae71ebcc409828b24ce9da402548ecdf1311 (patch) | |
| tree | 5edfafc2828d3bcebb3698520ccba374cd4328c0 /drivers/net/ethernet/emulex/benet | |
| parent | sched/fair: Don't push cfs_bandwith slack timers forward (diff) | |
| parent | Linux 5.2-rc6 (diff) | |
| download | kernel-qcow2-linux-d2abae71ebcc409828b24ce9da402548ecdf1311.tar.gz kernel-qcow2-linux-d2abae71ebcc409828b24ce9da402548ecdf1311.tar.xz kernel-qcow2-linux-d2abae71ebcc409828b24ce9da402548ecdf1311.zip | |
Merge tag 'v5.2-rc6' into sched/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/emulex/benet')
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be_ethtool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c index fb308b330dc1..8a6785173228 100644 --- a/drivers/net/ethernet/emulex/benet/be_ethtool.c +++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c @@ -1101,7 +1101,7 @@ static int be_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, cmd->data = be_get_rss_hash_opts(adapter, cmd->flow_type); break; case ETHTOOL_GRXRINGS: - cmd->data = adapter->num_rx_qs - 1; + cmd->data = adapter->num_rx_qs; break; default: return -EINVAL; |