From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Andre Guedes <andre.guedes@intel.com>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
Aaron Brown <aaron.f.brown@intel.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next v2 10/15] igc: Get rid of igc_max_channels()
Date: Thu, 21 May 2020 17:11:03 -0700 [thread overview]
Message-ID: <20200522001108.1675149-11-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20200522001108.1675149-1-jeffrey.t.kirsher@intel.com>
From: Andre Guedes <andre.guedes@intel.com>
The local function igc_max_channels() is a pointless wrapper around
igc_get_max_rss_queues(). This patch removes it and updates the callers
accordingly. It also does some cleanup on igc_get_max_rss_queues().
Signed-off-by: Andre Guedes <andre.guedes@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/igc/igc_ethtool.c | 9 ++-------
drivers/net/ethernet/intel/igc/igc_main.c | 7 +------
2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c
index 42ecb493c1a2..9081f36ee1f7 100644
--- a/drivers/net/ethernet/intel/igc/igc_ethtool.c
+++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c
@@ -1508,18 +1508,13 @@ static int igc_set_rxfh(struct net_device *netdev, const u32 *indir,
return 0;
}
-static unsigned int igc_max_channels(struct igc_adapter *adapter)
-{
- return igc_get_max_rss_queues(adapter);
-}
-
static void igc_get_channels(struct net_device *netdev,
struct ethtool_channels *ch)
{
struct igc_adapter *adapter = netdev_priv(netdev);
/* Report maximum channels */
- ch->max_combined = igc_max_channels(adapter);
+ ch->max_combined = igc_get_max_rss_queues(adapter);
/* Report info for other vector */
if (adapter->flags & IGC_FLAG_HAS_MSIX) {
@@ -1546,7 +1541,7 @@ static int igc_set_channels(struct net_device *netdev,
return -EINVAL;
/* Verify the number of channels doesn't exceed hw limits */
- max_combined = igc_max_channels(adapter);
+ max_combined = igc_get_max_rss_queues(adapter);
if (count > max_combined)
return -EINVAL;
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index 398a9307af2b..843e8a2aaf24 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -2731,12 +2731,7 @@ void igc_set_flag_queue_pairs(struct igc_adapter *adapter,
unsigned int igc_get_max_rss_queues(struct igc_adapter *adapter)
{
- unsigned int max_rss_queues;
-
- /* Determine the maximum number of RSS queues supported. */
- max_rss_queues = IGC_MAX_RX_QUEUES;
-
- return max_rss_queues;
+ return IGC_MAX_RX_QUEUES;
}
static void igc_init_queue_configuration(struct igc_adapter *adapter)
--
2.26.2
next prev parent reply other threads:[~2020-05-22 0:11 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-22 0:10 [net-next v2 00/15][pull request] 1GbE Intel Wired LAN Driver Updates 2020-05-21 Jeff Kirsher
2020-05-22 0:10 ` [net-next v2 01/15] igc: Remove IGC_MAC_STATE_SRC_ADDR flag Jeff Kirsher
2020-05-22 0:10 ` [net-next v2 02/15] igc: Remove mac_table from igc_adapter Jeff Kirsher
2020-05-22 0:10 ` [net-next v2 03/15] igc: Add support for source address filters in core Jeff Kirsher
2020-05-22 0:10 ` [net-next v2 04/15] igc: Enable NFC rules based source MAC address Jeff Kirsher
2020-05-22 0:10 ` [net-next v2 05/15] e1000: Do not perform reset in reset_task if we are already down Jeff Kirsher
2020-05-22 0:10 ` [net-next v2 06/15] igc: Remove obsolete circuit breaker registers Jeff Kirsher
2020-05-22 0:11 ` [net-next v2 07/15] igc: Remove header redirection register Jeff Kirsher
2020-05-22 0:11 ` [net-next v2 08/15] igc: Remove per queue good transmited counter register Jeff Kirsher
2020-05-22 0:11 ` [net-next v2 09/15] igc: Remove unused field from igc_nfc_filter Jeff Kirsher
2020-05-22 0:11 ` Jeff Kirsher [this message]
2020-05-22 0:11 ` [net-next v2 11/15] igc: Cleanup _get|set_rxnfc ethtool ops Jeff Kirsher
2020-05-22 0:11 ` [net-next v2 12/15] igc: Early return in igc_get_ethtool_nfc_entry() Jeff Kirsher
2020-05-22 0:11 ` [net-next v2 13/15] igc: Add 'igc_ethtool_' prefix to functions in igc_ethtool.c Jeff Kirsher
2020-05-22 0:11 ` [net-next v2 14/15] igc: Align terms used in NFC support code Jeff Kirsher
2020-05-22 0:11 ` [net-next v2 15/15] igc: Change byte order in struct igc_nfc_filter Jeff Kirsher
2020-05-22 17:27 ` [net-next v2 00/15][pull request] 1GbE Intel Wired LAN Driver Updates 2020-05-21 Jakub Kicinski
2020-05-22 20:49 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200522001108.1675149-11-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=aaron.f.brown@intel.com \
--cc=andre.guedes@intel.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).