diff options
| author | Jakub Kicinski <[email protected]> | 2024-01-05 02:04:58 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2024-01-05 02:06:46 +0000 |
| commit | e63c1822ac32a865dd02a18107fc933fd7b30f6f (patch) | |
| tree | 3d3875012e8412080a5ecc5f71d8f7e849bd4a95 /drivers/net/ethernet/intel/ice/ice_main.c | |
| parent | Merge tag 'wireless-next-2024-01-03' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | Merge tag 'net-6.7-rc9' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | kernel-e63c1822ac32a865dd02a18107fc933fd7b30f6f.tar.gz kernel-e63c1822ac32a865dd02a18107fc933fd7b30f6f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Conflicts:
drivers/net/ethernet/broadcom/bnxt/bnxt.c
e009b2efb7a8 ("bnxt_en: Remove mis-applied code from bnxt_cfg_ntp_filters()")
0f2b21477988 ("bnxt_en: Fix compile error without CONFIG_RFS_ACCEL")
https://lore.kernel.org/all/[email protected]/
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_main.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 63a5fb701ada..dd4a9bc0dfdc 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -2161,7 +2161,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); @@ -9398,8 +9398,14 @@ int ice_stop(struct net_device *netdev) int link_err = ice_force_phys_link_state(vsi, false); if (link_err) { - netdev_err(vsi->netdev, "Failed to set physical link down, VSI %d error %d\n", - vsi->vsi_num, 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); + + ice_vsi_close(vsi); return -EIO; } } |