Commit 27b8d4d7 authored Aug 15, 2022 by David S. Miller

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net


-queue

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2022-08-11 (ice)

This series contains updates to ice driver only.

Benjamin corrects a misplaced parenthesis for a WARN_ON check.

Michal removes WARN_ON from a check as its recoverable and not
warranting of a call trace.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents 0ff4eb3d cf90b743

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3181,7 +3181,7 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, bool init_vsi)

		pf = vsi->back;
		vtype = vsi->type;
		if (WARN_ON(vtype == ICE_VSI_VF) && !vsi->vf)
		if (WARN_ON(vtype == ICE_VSI_VF && !vsi->vf))
		return -EINVAL;

		ice_vsi_init_vlan_ops(vsi);

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -571,8 +571,10 @@ int ice_reset_vf(struct ice_vf *vf, u32 flags)

		if (ice_is_vf_disabled(vf)) {
		vsi = ice_get_vf_vsi(vf);
		if (WARN_ON(!vsi))
		if (!vsi) {
		dev_dbg(dev, "VF is already removed\n");
		return -EINVAL;
		}
		ice_vsi_stop_lan_tx_rings(vsi, ICE_NO_RESET, vf->vf_id);
		ice_vsi_stop_all_rx_rings(vsi);
		dev_dbg(dev, "VF is already disabled, there is no need for resetting it, telling VM, all is fine %d\n",