From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Greg Rose <gregory.v.rose@intel.com>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Catherine Sullivan <catherine.sullivan@intel.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next v2 03/14] i40e: Make the alloc and free queue vector calls orthogonal
Date: Fri, 28 Mar 2014 07:08:04 -0700 [thread overview]
Message-ID: <1396015695-25283-4-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1396015695-25283-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Greg Rose <gregory.v.rose@intel.com>
It's annoying to search for a matching alloc and free set of function calls
when they don't use the same framework for the name of the functions. Fix
that up in the case of alloc and free of vsi queue vectors.
i40e_vsi_free_q*
i40e_vsi_alloc_q*
Change-ID: I510eb863a0fbe405312bebea55c2846c76285e6d
Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 28df88e..91fd1f1 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -6111,13 +6111,13 @@ static int i40e_init_msix(struct i40e_pf *pf)
}
/**
- * i40e_alloc_q_vector - Allocate memory for a single interrupt vector
+ * i40e_vsi_alloc_q_vector - Allocate memory for a single interrupt vector
* @vsi: the VSI being configured
* @v_idx: index of the vector in the vsi struct
*
* We allocate one q_vector. If allocation fails we return -ENOMEM.
**/
-static int i40e_alloc_q_vector(struct i40e_vsi *vsi, int v_idx)
+static int i40e_vsi_alloc_q_vector(struct i40e_vsi *vsi, int v_idx)
{
struct i40e_q_vector *q_vector;
@@ -6143,13 +6143,13 @@ static int i40e_alloc_q_vector(struct i40e_vsi *vsi, int v_idx)
}
/**
- * i40e_alloc_q_vectors - Allocate memory for interrupt vectors
+ * i40e_vsi_alloc_q_vectors - Allocate memory for interrupt vectors
* @vsi: the VSI being configured
*
* We allocate one q_vector per queue interrupt. If allocation fails we
* return -ENOMEM.
**/
-static int i40e_alloc_q_vectors(struct i40e_vsi *vsi)
+static int i40e_vsi_alloc_q_vectors(struct i40e_vsi *vsi)
{
struct i40e_pf *pf = vsi->back;
int v_idx, num_q_vectors;
@@ -6164,7 +6164,7 @@ static int i40e_alloc_q_vectors(struct i40e_vsi *vsi)
return -EINVAL;
for (v_idx = 0; v_idx < num_q_vectors; v_idx++) {
- err = i40e_alloc_q_vector(vsi, v_idx);
+ err = i40e_vsi_alloc_q_vector(vsi, v_idx);
if (err)
goto err_out;
}
@@ -7020,7 +7020,7 @@ static int i40e_vsi_setup_vectors(struct i40e_vsi *vsi)
return -EEXIST;
}
- ret = i40e_alloc_q_vectors(vsi);
+ ret = i40e_vsi_alloc_q_vectors(vsi);
if (ret) {
dev_info(&pf->pdev->dev,
"failed to allocate %d q_vector for VSI %d, ret=%d\n",
--
1.9.0
next prev parent reply other threads:[~2014-03-28 14:08 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-28 14:08 [net-next v2 00/14][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2014-03-28 14:08 ` [net-next v2 01/14] i40e: Delete ATR filter on RST Jeff Kirsher
2014-03-28 14:08 ` [net-next v2 02/14] i40evf: fix oops in watchdog handler Jeff Kirsher
2014-03-28 14:08 ` Jeff Kirsher [this message]
2014-03-28 14:08 ` [net-next v2 04/14] i40e: eeprom integrity check on load and empr Jeff Kirsher
2014-03-28 14:08 ` [net-next v2 05/14] i40e: Cleanup in FDIR SB ethtool code Jeff Kirsher
2014-03-28 14:08 ` [net-next v2 06/14] i40e: Add functionality for FD SB to drop packets Jeff Kirsher
2014-03-28 14:08 ` [net-next v2 07/14] i40evf: remove double space after return Jeff Kirsher
2014-03-28 19:58 ` Or Gerlitz
2014-03-31 17:48 ` Jesse Brandeburg
2014-03-31 18:18 ` Or Gerlitz
2014-03-31 18:24 ` Jeff Kirsher
2014-03-28 14:08 ` [net-next v2 08/14] i40e: check for netdev before debugfs use Jeff Kirsher
2014-03-28 14:08 ` [net-next v2 09/14] i40e/i40evf: Add an FD message level Jeff Kirsher
2014-03-28 14:08 ` [net-next v2 10/14] i40e: Use DEBUG_FD message level for an FD message Jeff Kirsher
2014-03-28 14:08 ` [net-next v2 11/14] e1000e: add timeout for TX HW time stamping work Jeff Kirsher
2014-03-28 14:08 ` [net-next v2 12/14] e1000e: remove redundant if clause from PTP work Jeff Kirsher
2014-03-28 14:08 ` [net-next v2 13/14] igb: never generate both software and hardware timestamps Jeff Kirsher
2014-03-28 14:08 ` [net-next v2 14/14] igb: fix race conditions on queuing skb for HW time stamp Jeff Kirsher
2014-03-28 18:45 ` [net-next v2 00/14][pull request] Intel Wired LAN Driver Updates 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=1396015695-25283-4-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=catherine.sullivan@intel.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.com \
--cc=gregory.v.rose@intel.com \
--cc=netdev@vger.kernel.org \
--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).