xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ice: add missing checks for PF vsi type

Browse Source 
[ Upstream commit 6a8d013e904ad9a66706fcc926ec9993bed7d190 ]

There were a few places we had missed checking the VSI type to make sure
it was definitely a PF VSI, before calling setup functions intended only
for the PF VSI.

This doesn't fix any explicit bugs but cleans up the code in a few
places and removes one explicit != vsi->type check that can be
superseded by this code (it's a super set)

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jesse Brandeburg
2022-12-13 16:01:31 -08:00
committed by Greg Kroah-Hartman
parent b33091fc28
commit 9f1865ebfa
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5200,15 +5200,12 @@ int ice_vsi_cfg(struct ice_vsi *vsi)
{ {
int err; int err;
if (vsi->netdev) { if (vsi->netdev && vsi->type == ICE_VSI_PF) {
ice_set_rx_mode(vsi->netdev); ice_set_rx_mode(vsi->netdev);
if (vsi->type != ICE_VSI_LB) { err = ice_vsi_vlan_setup(vsi);
err = ice_vsi_vlan_setup(vsi); if (err)
return err;
if (err)
return err;
}
} }
ice_vsi_cfg_dcb_rings(vsi); ice_vsi_cfg_dcb_rings(vsi);
@@ -5267,7 +5264,7 @@ static int ice_up_complete(struct ice_vsi *vsi)
if (vsi->port_info && if (vsi->port_info &&
(vsi->port_info->phy.link_info.link_info & ICE_AQ_LINK_UP) && (vsi->port_info->phy.link_info.link_info & ICE_AQ_LINK_UP) &&
vsi->netdev) { vsi->netdev && vsi->type == ICE_VSI_PF) {
ice_print_link_msg(vsi, true); ice_print_link_msg(vsi, true);
netif_tx_start_all_queues(vsi->netdev); netif_tx_start_all_queues(vsi->netdev);
netif_carrier_on(vsi->netdev); netif_carrier_on(vsi->netdev);
@@ -5277,7 +5274,9 @@ static int ice_up_complete(struct ice_vsi *vsi)
* set the baseline so counters are ready when interface is up * set the baseline so counters are ready when interface is up
*/ */
ice_update_eth_stats(vsi); ice_update_eth_stats(vsi);
ice_service_task_schedule(pf);
if (vsi->type == ICE_VSI_PF)
ice_service_task_schedule(pf);
return 0; return 0;
} }