Commit 6a8d8bb5 authored by Katarzyna Wieczerzycka's avatar Katarzyna Wieczerzycka Committed by Tony Nguyen
Browse files

ice: Fix link_down_on_close message 



The driver should not report an error message when for a medialess port
the link_down_on_close flag is enabled and the physical link cannot be
set down.

Fixes: 8ac71327 ("ice: Fix interface being down after reset with link-down-on-close flag on")
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: default avatarKatarzyna Wieczerzycka <katarzyna.wieczerzycka@intel.com>
Signed-off-by: default avatarWojciech Drewek <wojciech.drewek@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 49fcf34a

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

+7 −3
Original line number Diff line number Diff line
@@ -2146,7 +2146,7 @@ static int ice_configure_phy(struct ice_vsi *vsi) 


	/* Ensure we have media as we cannot configure a medialess port */

	if (!(phy->link_info.link_info & ICE_AQ_MEDIA_AVAILABLE))

		return -EPERM;

		return -ENOMEDIUM;



	ice_print_topo_conflict(vsi);
@@ -9187,6 +9187,10 @@ int ice_stop(struct net_device *netdev) 
		int link_err = ice_force_phys_link_state(vsi, false);



		if (link_err) {

			if (link_err == -ENOMEDIUM)

				netdev_info(vsi->netdev, "Skipping link reconfig - no media attached, VSI %d\n",

					    vsi->vsi_num);

			else

				netdev_err(vsi->netdev, "Failed to set physical link down, VSI %d error %d\n",

					   vsi->vsi_num, link_err);

			return -EIO;