netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>,
	netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
	jogreene@redhat.com, Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 10/16] i40e: refactor DCB function
Date: Tue, 16 Feb 2016 21:34:16 -0800	[thread overview]
Message-ID: <1455687262-20453-11-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1455687262-20453-1-git-send-email-jeffrey.t.kirsher@intel.com>

From: Jesse Brandeburg <jesse.brandeburg@intel.com>

This is a simple refactor suggested by the community
to change a multi-level if statement into a switch.

Change-ID: I831cf3c40426022220aa9b43990022d22dfd50db
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Acked-by: Shannon Nelson <shannon.nelson@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/i40e/i40e_dcb.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb.c b/drivers/net/ethernet/intel/i40e/i40e_dcb.c
index 582daa7..0fab3a9 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_dcb.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_dcb.c
@@ -380,17 +380,20 @@ static void i40e_parse_cee_app_tlv(struct i40e_cee_feat_tlv *tlv,
 {
 	u16 length, typelength, offset = 0;
 	struct i40e_cee_app_prio *app;
-	u8 i, up, selector;
+	u8 i;
 
 	typelength = ntohs(tlv->hdr.typelen);
 	length = (u16)((typelength & I40E_LLDP_TLV_LEN_MASK) >>
 		       I40E_LLDP_TLV_LEN_SHIFT);
 
 	dcbcfg->numapps = length / sizeof(*app);
+
 	if (!dcbcfg->numapps)
 		return;
 
 	for (i = 0; i < dcbcfg->numapps; i++) {
+		u8 up, selector;
+
 		app = (struct i40e_cee_app_prio *)(tlv->tlvinfo + offset);
 		for (up = 0; up < I40E_MAX_USER_PRIORITY; up++) {
 			if (app->prio_map & BIT(up))
@@ -400,13 +403,17 @@ static void i40e_parse_cee_app_tlv(struct i40e_cee_feat_tlv *tlv,
 
 		/* Get Selector from lower 2 bits, and convert to IEEE */
 		selector = (app->upper_oui_sel & I40E_CEE_APP_SELECTOR_MASK);
-		if (selector == I40E_CEE_APP_SEL_ETHTYPE)
+		switch (selector) {
+		case I40E_CEE_APP_SEL_ETHTYPE:
 			dcbcfg->app[i].selector = I40E_APP_SEL_ETHTYPE;
-		else if (selector == I40E_CEE_APP_SEL_TCPIP)
+			break;
+		case I40E_CEE_APP_SEL_TCPIP:
 			dcbcfg->app[i].selector = I40E_APP_SEL_TCPIP;
-		else
+			break;
+		default:
 			/* Keep selector as it is for unknown types */
 			dcbcfg->app[i].selector = selector;
+		}
 
 		dcbcfg->app[i].protocolid = ntohs(app->protocol);
 		/* Move to next app */
-- 
2.5.0

  parent reply	other threads:[~2016-02-17  5:34 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-17  5:34 [net-next 00/16][pull request] 40GbE Intel Wired LAN Driver Updates 2016-02-16 Jeff Kirsher
2016-02-17  5:34 ` [net-next 01/16] i40e: AQ Shared resource flags Jeff Kirsher
2016-02-17  5:34 ` [net-next 02/16] i40e: AQ Add set_switch_config Jeff Kirsher
2016-02-17  5:34 ` [net-next 03/16] i40e: AQ Add VXLAN-GPE tunnel type Jeff Kirsher
2016-02-17  5:34 ` [net-next 04/16] i40e: AQ thermal sensor control struct Jeff Kirsher
2016-02-17  5:34 ` [net-next 05/16] i40e: Bump AQ minor version to 1.5 for new FW features Jeff Kirsher
2016-02-17  5:34 ` [net-next 06/16] i40e: Store lan_vsi_idx and lan_vsi_id in the right size Jeff Kirsher
2016-02-17  5:34 ` [net-next 07/16] i40e: fix write-back-on-itr to work with legacy itr Jeff Kirsher
2016-02-17  5:34 ` [net-next 08/16] i40e: add counter for arq overflows Jeff Kirsher
2016-02-17  5:34 ` [net-next 09/16] i40e: add 20G speed for Tx bandwidth calculations Jeff Kirsher
2016-02-17  5:34 ` Jeff Kirsher [this message]
2016-02-17  5:34 ` [net-next 11/16] i40e: add a little more to an NVM update debug message Jeff Kirsher
2016-02-17  5:34 ` [net-next 12/16] i40evf: enable bus master after reset Jeff Kirsher
2016-02-17  5:34 ` [net-next 13/16] i40e: add netdev info to VSI dump Jeff Kirsher
2016-02-17  5:34 ` [net-next 14/16] i40e: remove VF device IDs from PF Jeff Kirsher
2016-02-17  5:34 ` [net-next 15/16] i40e: trivial: remove unnecessary local var Jeff Kirsher
2016-02-17  5:34 ` [net-next 16/16] i40e/i40evf: Bump i40e to 1.4.11 and i40evf to 1.4.7 Jeff Kirsher
2016-02-17 14:49 ` [net-next 00/16][pull request] 40GbE Intel Wired LAN Driver Updates 2016-02-16 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=1455687262-20453-11-git-send-email-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=davem@davemloft.net \
    --cc=jesse.brandeburg@intel.com \
    --cc=jogreene@redhat.com \
    --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).