All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Brett Creeley <brett.creeley@intel.com>,
	netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
	Andrew Bowers <andrewx.bowers@intel.com>,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next v2 13/14] ice: Rename VF function ice_vc_dis_vf to match its behavior
Date: Wed,  6 Nov 2019 11:37:55 -0800	[thread overview]
Message-ID: <20191106193756.23819-14-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20191106193756.23819-1-jeffrey.t.kirsher@intel.com>

From: Brett Creeley <brett.creeley@intel.com>

ice_vc_dis_vf() tells iavf that it's going to perform a reset
and then performs a software reset. This is misleading based on
the function name because the VF does not get disabled. So fix
this by changing the name to ice_vc_reset_vf().

Signed-off-by: Brett Creeley <brett.creeley@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
index 3d8c231b0614..7ef2cc739587 100644
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
@@ -1496,12 +1496,10 @@ void ice_process_vflr_event(struct ice_pf *pf)
 }
 
 /**
- * ice_vc_dis_vf - Disable a given VF via SW reset
+ * ice_vc_reset_vf - Perform software reset on the VF after informing the AVF
  * @vf: pointer to the VF info
- *
- * Disable the VF through a SW reset
  */
-static void ice_vc_dis_vf(struct ice_vf *vf)
+static void ice_vc_reset_vf(struct ice_vf *vf)
 {
 	ice_vc_notify_vf_reset(vf);
 	ice_reset_vf(vf, false);
@@ -2541,7 +2539,7 @@ static int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg)
 	} else {
 		/* request is successful, then reset VF */
 		vf->num_req_qs = req_queues;
-		ice_vc_dis_vf(vf);
+		ice_vc_reset_vf(vf);
 		dev_info(&pf->pdev->dev,
 			 "VF %d granted request of %u queues.\n",
 			 vf->vf_id, req_queues);
@@ -3168,7 +3166,7 @@ int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)
 		    "MAC on VF %d set to %pM. VF driver will be reinitialized\n",
 		    vf_id, mac);
 
-	ice_vc_dis_vf(vf);
+	ice_vc_reset_vf(vf);
 	return ret;
 }
 
@@ -3204,7 +3202,7 @@ int ice_set_vf_trust(struct net_device *netdev, int vf_id, bool trusted)
 		return 0;
 
 	vf->trusted = trusted;
-	ice_vc_dis_vf(vf);
+	ice_vc_reset_vf(vf);
 	dev_info(&pf->pdev->dev, "VF %u is now %strusted\n",
 		 vf_id, trusted ? "" : "un");
 
-- 
2.21.0


  parent reply	other threads:[~2019-11-06 19:38 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-06 19:37 [net-next v2 00/14][pull request] 100GbE Intel Wired LAN Driver Updates 2019-11-06 Jeff Kirsher
2019-11-06 19:37 ` [net-next v2 01/14] ice: implement set_eeprom functionality Jeff Kirsher
2019-11-06 19:37 ` [net-next v2 02/14] ice: add ethtool -m support for reading i2c eeprom modules Jeff Kirsher
2019-11-06 19:37 ` [net-next v2 03/14] ice: Update Boot Configuration Section read of NVM Jeff Kirsher
2019-11-06 19:37 ` [net-next v2 04/14] ice: handle DCBx non-contiguous TC request Jeff Kirsher
2019-11-06 19:37 ` [net-next v2 05/14] ice: fix driver unload flow Jeff Kirsher
2019-11-06 19:37 ` [net-next v2 06/14] ice: Adjust DCB INIT for SW mode Jeff Kirsher
2019-11-06 19:37 ` [net-next v2 07/14] ice: save PCI state in probe Jeff Kirsher
2019-11-06 19:37 ` [net-next v2 08/14] ice: Check for null pointer dereference when setting rings Jeff Kirsher
2019-11-06 19:37 ` [net-next v2 09/14] ice: write register with correct offset Jeff Kirsher
2019-11-06 19:37 ` [net-next v2 10/14] ice: print unsupported module message Jeff Kirsher
2019-11-06 19:37 ` [net-next v2 11/14] ice: print PCI link speed and width Jeff Kirsher
2019-11-06 19:37 ` [net-next v2 12/14] ice: Get rid of ice_cleanup_header Jeff Kirsher
2019-11-06 19:37 ` Jeff Kirsher [this message]
2019-11-06 19:37 ` [net-next v2 14/14] ice: Fix return value when SR-IOV is not supported Jeff Kirsher
2019-11-06 23:49 ` [net-next v2 00/14][pull request] 100GbE Intel Wired LAN Driver Updates 2019-11-06 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=20191106193756.23819-14-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=andrewx.bowers@intel.com \
    --cc=brett.creeley@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.