iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ice: use ice_for_each_vsi macro when possible

Browse Source 
Replace all instances of:
	for (i = 0; i < pf->num_alloc_vsi; i++)

with the following macro:
	ice_for_each_vsi(pf, i)

This will allow the code to be consistent since there are currently
cases of using both.

Signed-off-by: Brett Creeley <brett.creeley@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Brett Creeley 2019-02-08 12:50:54 -08:00 committed by Jeff Kirsher
parent d8df260af7
commit 80ed404abb
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/intel/ice/ice_ethtool.c
View File

@ -1400,13 +1400,12 @@ ice_set_link_ksettings(struct net_device *netdev,
return -EOPNOTSUPP; return -EOPNOTSUPP;
/* Check if this is lan vsi */ /* Check if this is lan vsi */
for (idx = 0 ; idx < pf->num_alloc_vsi ; idx++) { ice_for_each_vsi(pf, idx)
if (pf->vsi[idx]->type == ICE_VSI_PF) { if (pf->vsi[idx]->type == ICE_VSI_PF) {
if (np->vsi != pf->vsi[idx]) if (np->vsi != pf->vsi[idx])
return -EOPNOTSUPP; return -EOPNOTSUPP;
break; break;
} }
}
if (p->phy.media_type != ICE_MEDIA_BASET && if (p->phy.media_type != ICE_MEDIA_BASET &&
p->phy.media_type != ICE_MEDIA_FIBER && p->phy.media_type != ICE_MEDIA_FIBER &&

12
drivers/net/ethernet/intel/ice/ice_main.c
View File

@ -322,7 +322,7 @@ static void ice_sync_fltr_subtask(struct ice_pf *pf)
clear_bit(ICE_FLAG_FLTR_SYNC, pf->flags); clear_bit(ICE_FLAG_FLTR_SYNC, pf->flags);
for (v = 0; v < pf->num_alloc_vsi; v++) ice_for_each_vsi(pf, v)
if (pf->vsi[v] && ice_vsi_fltr_changed(pf->vsi[v]) && if (pf->vsi[v] && ice_vsi_fltr_changed(pf->vsi[v]) &&
ice_vsi_sync_fltr(pf->vsi[v])) { ice_vsi_sync_fltr(pf->vsi[v])) {
/* come back and try again later */ /* come back and try again later */
@ -642,7 +642,7 @@ static void ice_watchdog_subtask(struct ice_pf *pf)
* can look at updated numbers whenever it cares to * can look at updated numbers whenever it cares to
*/ */
ice_update_pf_stats(pf); ice_update_pf_stats(pf);
for (i = 0; i < pf->num_alloc_vsi; i++) ice_for_each_vsi(pf, i)
if (pf->vsi[i] && pf->vsi[i]->netdev) if (pf->vsi[i] && pf->vsi[i]->netdev)
ice_update_vsi_stats(pf->vsi[i]); ice_update_vsi_stats(pf->vsi[i]);
} }
@ -3273,7 +3273,7 @@ static void ice_vsi_release_all(struct ice_pf *pf)
if (!pf->vsi) if (!pf->vsi)
return; return;
for (i = 0; i < pf->num_alloc_vsi; i++) { ice_for_each_vsi(pf, i) {
if (!pf->vsi[i]) if (!pf->vsi[i])
continue; continue;
@ -3372,7 +3372,7 @@ static int ice_vsi_rebuild_all(struct ice_pf *pf)
int i; int i;
/* loop through pf->vsi array and reinit the VSI if found */ /* loop through pf->vsi array and reinit the VSI if found */
for (i = 0; i < pf->num_alloc_vsi; i++) { ice_for_each_vsi(pf, i) {
int err; int err;
if (!pf->vsi[i]) if (!pf->vsi[i])
@ -3409,7 +3409,7 @@ static int ice_vsi_replay_all(struct ice_pf *pf)
int i; int i;
/* loop through pf->vsi array and replay the VSI if found */ /* loop through pf->vsi array and replay the VSI if found */
for (i = 0; i < pf->num_alloc_vsi; i++) { ice_for_each_vsi(pf, i) {
if (!pf->vsi[i]) if (!pf->vsi[i])
continue; continue;
@ -3520,7 +3520,7 @@ static void ice_rebuild(struct ice_pf *pf)
ice_reset_all_vfs(pf, true); ice_reset_all_vfs(pf, true);
for (i = 0; i < pf->num_alloc_vsi; i++) { ice_for_each_vsi(pf, i) {
bool link_up; bool link_up;
if (!pf->vsi[i] || pf->vsi[i]->type != ICE_VSI_PF) if (!pf->vsi[i] || pf->vsi[i]->type != ICE_VSI_PF)

2
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
View File

@ -1385,7 +1385,7 @@ static struct ice_vsi *ice_find_vsi_from_id(struct ice_pf *pf, u16 id)
{ {
int i; int i;
for (i = 0; i < pf->num_alloc_vsi; i++) ice_for_each_vsi(pf, i)
if (pf->vsi[i] && pf->vsi[i]->vsi_num == id) if (pf->vsi[i] && pf->vsi[i]->vsi_num == id)
return pf->vsi[i]; return pf->vsi[i];