diff options
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_main.c | 12 |
1 files 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 28df88ef3c8b..91fd1f1f8f45 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) | |||
6111 | } | 6111 | } |
6112 | 6112 | ||
6113 | /** | 6113 | /** |
6114 | * i40e_alloc_q_vector - Allocate memory for a single interrupt vector | 6114 | * i40e_vsi_alloc_q_vector - Allocate memory for a single interrupt vector |
6115 | * @vsi: the VSI being configured | 6115 | * @vsi: the VSI being configured |
6116 | * @v_idx: index of the vector in the vsi struct | 6116 | * @v_idx: index of the vector in the vsi struct |
6117 | * | 6117 | * |
6118 | * We allocate one q_vector. If allocation fails we return -ENOMEM. | 6118 | * We allocate one q_vector. If allocation fails we return -ENOMEM. |
6119 | **/ | 6119 | **/ |
6120 | static int i40e_alloc_q_vector(struct i40e_vsi *vsi, int v_idx) | 6120 | static int i40e_vsi_alloc_q_vector(struct i40e_vsi *vsi, int v_idx) |
6121 | { | 6121 | { |
6122 | struct i40e_q_vector *q_vector; | 6122 | struct i40e_q_vector *q_vector; |
6123 | 6123 | ||
@@ -6143,13 +6143,13 @@ static int i40e_alloc_q_vector(struct i40e_vsi *vsi, int v_idx) | |||
6143 | } | 6143 | } |
6144 | 6144 | ||
6145 | /** | 6145 | /** |
6146 | * i40e_alloc_q_vectors - Allocate memory for interrupt vectors | 6146 | * i40e_vsi_alloc_q_vectors - Allocate memory for interrupt vectors |
6147 | * @vsi: the VSI being configured | 6147 | * @vsi: the VSI being configured |
6148 | * | 6148 | * |
6149 | * We allocate one q_vector per queue interrupt. If allocation fails we | 6149 | * We allocate one q_vector per queue interrupt. If allocation fails we |
6150 | * return -ENOMEM. | 6150 | * return -ENOMEM. |
6151 | **/ | 6151 | **/ |
6152 | static int i40e_alloc_q_vectors(struct i40e_vsi *vsi) | 6152 | static int i40e_vsi_alloc_q_vectors(struct i40e_vsi *vsi) |
6153 | { | 6153 | { |
6154 | struct i40e_pf *pf = vsi->back; | 6154 | struct i40e_pf *pf = vsi->back; |
6155 | int v_idx, num_q_vectors; | 6155 | int v_idx, num_q_vectors; |
@@ -6164,7 +6164,7 @@ static int i40e_alloc_q_vectors(struct i40e_vsi *vsi) | |||
6164 | return -EINVAL; | 6164 | return -EINVAL; |
6165 | 6165 | ||
6166 | for (v_idx = 0; v_idx < num_q_vectors; v_idx++) { | 6166 | for (v_idx = 0; v_idx < num_q_vectors; v_idx++) { |
6167 | err = i40e_alloc_q_vector(vsi, v_idx); | 6167 | err = i40e_vsi_alloc_q_vector(vsi, v_idx); |
6168 | if (err) | 6168 | if (err) |
6169 | goto err_out; | 6169 | goto err_out; |
6170 | } | 6170 | } |
@@ -7020,7 +7020,7 @@ static int i40e_vsi_setup_vectors(struct i40e_vsi *vsi) | |||
7020 | return -EEXIST; | 7020 | return -EEXIST; |
7021 | } | 7021 | } |
7022 | 7022 | ||
7023 | ret = i40e_alloc_q_vectors(vsi); | 7023 | ret = i40e_vsi_alloc_q_vectors(vsi); |
7024 | if (ret) { | 7024 | if (ret) { |
7025 | dev_info(&pf->pdev->dev, | 7025 | dev_info(&pf->pdev->dev, |
7026 | "failed to allocate %d q_vector for VSI %d, ret=%d\n", | 7026 | "failed to allocate %d q_vector for VSI %d, ret=%d\n", |