Skip to content

Commit 61fb3ee

Browse files
author
Paolo Abeni
committed
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 458f5d9: 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>
2 parents 2b04bd4 + 05ef681 commit 61fb3ee

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1480,6 +1480,7 @@ static int ice_vsi_alloc_rings(struct ice_vsi *vsi)
14801480
ring->tx_tstamps = &pf->ptp.port.tx;
14811481
ring->dev = dev;
14821482
ring->count = vsi->num_tx_desc;
1483+
ring->txq_teid = ICE_INVAL_TEID;
14831484
if (dvm_ena)
14841485
ring->flags |= ICE_TX_FLAGS_RING_VLAN_L2TAG2;
14851486
else

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,9 +1358,9 @@ static int ice_vc_dis_qs_msg(struct ice_vf *vf, u8 *msg)
13581358
goto error_param;
13591359
}
13601360

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

13651365
ice_fill_txq_meta(vsi, ring, &txq_meta);
13661366

0 commit comments

Comments
 (0)