netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 11/15] igc: Cleanup _get|set_rxnfc ethtool ops
Date: Thu, 21 May 2020 17:11:04 -0700	[thread overview]
Message-ID: <20200522001108.1675149-12-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20200522001108.1675149-1-jeffrey.t.kirsher@intel.com>

From: Andre Guedes <andre.guedes@intel.com>

This patch does a trivial change in igc_ethtool_get_rxnfc() and
igc_ethtool_set_rxnfc() to simplify their logic.

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 | 33 ++++++--------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c
index 9081f36ee1f7..37fb5f0544ad 100644
--- a/drivers/net/ethernet/intel/igc/igc_ethtool.c
+++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c
@@ -1055,31 +1055,23 @@ static int igc_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
 			 u32 *rule_locs)
 {
 	struct igc_adapter *adapter = netdev_priv(dev);
-	int ret = -EOPNOTSUPP;
 
 	switch (cmd->cmd) {
 	case ETHTOOL_GRXRINGS:
 		cmd->data = adapter->num_rx_queues;
-		ret = 0;
-		break;
+		return 0;
 	case ETHTOOL_GRXCLSRLCNT:
 		cmd->rule_cnt = adapter->nfc_filter_count;
-		ret = 0;
-		break;
+		return 0;
 	case ETHTOOL_GRXCLSRULE:
-		ret = igc_get_ethtool_nfc_entry(adapter, cmd);
-		break;
+		return igc_get_ethtool_nfc_entry(adapter, cmd);
 	case ETHTOOL_GRXCLSRLALL:
-		ret = igc_get_ethtool_nfc_all(adapter, cmd, rule_locs);
-		break;
+		return igc_get_ethtool_nfc_all(adapter, cmd, rule_locs);
 	case ETHTOOL_GRXFH:
-		ret = igc_get_rss_hash_opts(adapter, cmd);
-		break;
+		return igc_get_rss_hash_opts(adapter, cmd);
 	default:
-		break;
+		return -EOPNOTSUPP;
 	}
-
-	return ret;
 }
 
 #define UDP_RSS_FLAGS (IGC_FLAG_RSS_FIELD_IPV4_UDP | \
@@ -1418,22 +1410,17 @@ static int igc_del_ethtool_nfc_entry(struct igc_adapter *adapter,
 static int igc_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)
 {
 	struct igc_adapter *adapter = netdev_priv(dev);
-	int ret = -EOPNOTSUPP;
 
 	switch (cmd->cmd) {
 	case ETHTOOL_SRXFH:
-		ret = igc_set_rss_hash_opt(adapter, cmd);
-		break;
+		return igc_set_rss_hash_opt(adapter, cmd);
 	case ETHTOOL_SRXCLSRLINS:
-		ret = igc_add_ethtool_nfc_entry(adapter, cmd);
-		break;
+		return igc_add_ethtool_nfc_entry(adapter, cmd);
 	case ETHTOOL_SRXCLSRLDEL:
-		ret = igc_del_ethtool_nfc_entry(adapter, cmd);
+		return igc_del_ethtool_nfc_entry(adapter, cmd);
 	default:
-		break;
+		return -EOPNOTSUPP;
 	}
-
-	return ret;
 }
 
 void igc_write_rss_indir_tbl(struct igc_adapter *adapter)
-- 
2.26.2


  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 ` [net-next v2 10/15] igc: Get rid of igc_max_channels() Jeff Kirsher
2020-05-22  0:11 ` Jeff Kirsher [this message]
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-12-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).