Commit 61fb3eee authored Apr 05, 2022 by Paolo Abeni

Merge branch 'ice-bug-fixes'

Tony Nguyen says:

====================
ice bug fixes

Alice Michael says:

There were a couple of bugs that have been found and
fixed by Anatolii in the ice driver.  First he fixed
a bug on ring creation by setting the default value
for the teid.  Anatolli also fixed a bug with deleting
queues in ice_vc_dis_qs_msg based on their enablement.
---
v2: Remove empty lines between tags

The following are changes since commit 458f5d92:
  sfc: Do not free an empty page_ring
and are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue 100GbE
====================

Link: https://lore.kernel.org/r/20220404183548.3422851-1-anthony.l.nguyen@intel.com


Signed-off-by: Paolo Abeni <pabeni@redhat.com>

parents 2b04bd4f 05ef6813

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -1480,6 +1480,7 @@ static int ice_vsi_alloc_rings(struct ice_vsi *vsi)
		ring->tx_tstamps = &pf->ptp.port.tx;
		ring->dev = dev;
		ring->count = vsi->num_tx_desc;
		ring->txq_teid = ICE_INVAL_TEID;
		if (dvm_ena)
		ring->flags \|= ICE_TX_FLAGS_RING_VLAN_L2TAG2;
		else

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1358,9 +1358,9 @@ static int ice_vc_dis_qs_msg(struct ice_vf vf, u8 msg)
		goto error_param;
		}

		/* Skip queue if not enabled */
		if (!test_bit(vf_q_id, vf->txq_ena))
		continue;
		dev_dbg(ice_pf_to_dev(vsi->back), "Queue %u on VSI %u is not enabled, but stopping it anyway\n",
		vf_q_id, vsi->vsi_num);

		ice_fill_txq_meta(vsi, ring, &txq_meta);