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 12/15] igc: Early return in igc_get_ethtool_nfc_entry()
Date: Thu, 21 May 2020 00:27:55 -0700 [thread overview]
Message-ID: <20200521072758.440264-13-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20200521072758.440264-1-jeffrey.t.kirsher@intel.com>
From: Andre Guedes <andre.guedes@intel.com>
This patch re-writes the second half of igc_ethtool_get_nfc_entry() to
follow the 'return early' pattern seen in other parts of the driver and
removes some duplicate comments.
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 | 58 ++++++++++----------
1 file changed, 28 insertions(+), 30 deletions(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c
index 37fb5f0544ad..f03093d1f863 100644
--- a/drivers/net/ethernet/intel/igc/igc_ethtool.c
+++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c
@@ -945,38 +945,36 @@ static int igc_get_ethtool_nfc_entry(struct igc_adapter *adapter,
if (!rule || fsp->location != rule->sw_idx)
return -EINVAL;
- if (rule->filter.match_flags) {
- fsp->flow_type = ETHER_FLOW;
- fsp->ring_cookie = rule->action;
- if (rule->filter.match_flags & IGC_FILTER_FLAG_ETHER_TYPE) {
- fsp->h_u.ether_spec.h_proto = rule->filter.etype;
- fsp->m_u.ether_spec.h_proto = ETHER_TYPE_FULL_MASK;
- }
- if (rule->filter.match_flags & IGC_FILTER_FLAG_VLAN_TCI) {
- fsp->flow_type |= FLOW_EXT;
- fsp->h_ext.vlan_tci = rule->filter.vlan_tci;
- fsp->m_ext.vlan_tci = htons(VLAN_PRIO_MASK);
- }
- if (rule->filter.match_flags & IGC_FILTER_FLAG_DST_MAC_ADDR) {
- ether_addr_copy(fsp->h_u.ether_spec.h_dest,
- rule->filter.dst_addr);
- /* As we only support matching by the full
- * mask, return the mask to userspace
- */
- eth_broadcast_addr(fsp->m_u.ether_spec.h_dest);
- }
- if (rule->filter.match_flags & IGC_FILTER_FLAG_SRC_MAC_ADDR) {
- ether_addr_copy(fsp->h_u.ether_spec.h_source,
- rule->filter.src_addr);
- /* As we only support matching by the full
- * mask, return the mask to userspace
- */
- eth_broadcast_addr(fsp->m_u.ether_spec.h_source);
- }
+ if (!rule->filter.match_flags)
+ return -EINVAL;
- return 0;
+ fsp->flow_type = ETHER_FLOW;
+ fsp->ring_cookie = rule->action;
+
+ if (rule->filter.match_flags & IGC_FILTER_FLAG_ETHER_TYPE) {
+ fsp->h_u.ether_spec.h_proto = rule->filter.etype;
+ fsp->m_u.ether_spec.h_proto = ETHER_TYPE_FULL_MASK;
}
- return -EINVAL;
+
+ if (rule->filter.match_flags & IGC_FILTER_FLAG_VLAN_TCI) {
+ fsp->flow_type |= FLOW_EXT;
+ fsp->h_ext.vlan_tci = rule->filter.vlan_tci;
+ fsp->m_ext.vlan_tci = htons(VLAN_PRIO_MASK);
+ }
+
+ if (rule->filter.match_flags & IGC_FILTER_FLAG_DST_MAC_ADDR) {
+ ether_addr_copy(fsp->h_u.ether_spec.h_dest,
+ rule->filter.dst_addr);
+ eth_broadcast_addr(fsp->m_u.ether_spec.h_dest);
+ }
+
+ if (rule->filter.match_flags & IGC_FILTER_FLAG_SRC_MAC_ADDR) {
+ ether_addr_copy(fsp->h_u.ether_spec.h_source,
+ rule->filter.src_addr);
+ eth_broadcast_addr(fsp->m_u.ether_spec.h_source);
+ }
+
+ return 0;
}
static int igc_get_ethtool_nfc_all(struct igc_adapter *adapter,
--
2.26.2
next prev parent reply other threads:[~2020-05-21 7:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-21 7:27 [net-next 00/15][pull request] 1GbE Intel Wired LAN Driver Updates 2020-05-20 Jeff Kirsher
2020-05-21 7:27 ` [net-next 01/15] igc: Remove IGC_MAC_STATE_SRC_ADDR flag Jeff Kirsher
2020-05-21 7:27 ` [net-next 02/15] igc: Remove mac_table from igc_adapter Jeff Kirsher
2020-05-21 7:27 ` [net-next 03/15] igc: Add support for source address filters in core Jeff Kirsher
2020-05-21 16:23 ` Jakub Kicinski
2020-05-21 22:46 ` Kirsher, Jeffrey T
2020-05-21 7:27 ` [net-next 04/15] igc: Enable NFC rules based source MAC address Jeff Kirsher
2020-05-21 7:27 ` [net-next 05/15] e1000: Do not perform reset in reset_task if we are already down Jeff Kirsher
2020-05-21 7:27 ` [net-next 06/15] igc: Remove obsolete circuit breaker registers Jeff Kirsher
2020-05-21 7:27 ` [net-next 07/15] igc: Remove header redirection register Jeff Kirsher
2020-05-21 7:27 ` [net-next 08/15] igc: Remove per queue good transmited counter register Jeff Kirsher
2020-05-21 7:27 ` [net-next 09/15] igc: Remove unused field from igc_nfc_filter Jeff Kirsher
2020-05-21 7:27 ` [net-next 10/15] igc: Get rid of igc_max_channels() Jeff Kirsher
2020-05-21 7:27 ` [net-next 11/15] igc: Cleanup _get|set_rxnfc ethtool ops Jeff Kirsher
2020-05-21 7:27 ` Jeff Kirsher [this message]
2020-05-21 7:27 ` [net-next 13/15] igc: Add 'igc_ethtool_' prefix to functions in igc_ethtool.c Jeff Kirsher
2020-05-21 7:27 ` [net-next 14/15] igc: Align terms used in NFC support code Jeff Kirsher
2020-05-21 7:27 ` [net-next 15/15] igc: Change byte order in struct igc_nfc_filter Jeff Kirsher
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=20200521072758.440264-13-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).