Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1343528 authored by Maciej Fijalkowski's avatar Maciej Fijalkowski Committed by Greg Kroah-Hartman
Browse files

ice: do not setup vlan for loopback VSI 



commit cc019545a238518fa9da1e2a889f6e1bb1005a63 upstream.

Currently loopback test is failiing due to the error returned from
ice_vsi_vlan_setup(). Skip calling it when preparing loopback VSI.

Fixes: 0e674aeb ("ice: Add handler for ethtool selftest")
Signed-off-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Tested-by: default avatarGeorge Kuruvinakunnel <george.kuruvinakunnel@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 15d01986

drivers/net/ethernet/intel/ice/ice_main.c

+5 −3
Original line number Diff line number Diff line
@@ -3495,11 +3495,13 @@ int ice_vsi_cfg(struct ice_vsi *vsi) 
	if (vsi->netdev) {

		ice_set_rx_mode(vsi->netdev);



		if (vsi->type != ICE_VSI_LB) {

			err = ice_vsi_vlan_setup(vsi);



			if (err)

				return err;

		}

	}

	ice_vsi_cfg_dcb_rings(vsi);



	err = ice_vsi_cfg_lan_txqs(vsi);