From: Greg Kroah-Hartman Date: Mon, 16 Oct 2023 17:04:28 +0000 (+0200) Subject: fix up queue-6.1/net-mana-fix-tx-cqe-error-handling.patch X-Git-Tag: v5.15.136~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e2cff24d3ad845f37b726a7ef09870125d946361;p=thirdparty%2Fkernel%2Fstable-queue.git fix up queue-6.1/net-mana-fix-tx-cqe-error-handling.patch --- diff --git a/queue-6.1/net-mana-fix-tx-cqe-error-handling.patch b/queue-6.1/net-mana-fix-tx-cqe-error-handling.patch index d47d5755bbc..13b7e65aefd 100644 --- a/queue-6.1/net-mana-fix-tx-cqe-error-handling.patch +++ b/queue-6.1/net-mana-fix-tx-cqe-error-handling.patch @@ -22,14 +22,12 @@ Reviewed-by: Shradha Gupta Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- - drivers/net/ethernet/microsoft/mana/mana_en.c | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) + drivers/net/ethernet/microsoft/mana/mana_en.c | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) -diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c -index 4f4204432aaa3..23ce26b8295dc 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c -@@ -1003,16 +1003,20 @@ static void mana_poll_tx_cq(struct mana_cq *cq) +@@ -1003,17 +1003,21 @@ static void mana_poll_tx_cq(struct mana_ case CQE_TX_VPORT_IDX_OUT_OF_RANGE: case CQE_TX_VPORT_DISABLED: case CQE_TX_VLAN_TAGGING_VIOLATION: @@ -49,13 +47,12 @@ index 4f4204432aaa3..23ce26b8295dc 100644 */ - WARN_ONCE(1, "TX: Unexpected CQE type %d: HW BUG?\n", - cqe_oob->cqe_hdr.cqe_type); +- return; + if (net_ratelimit()) + netdev_err(ndev, "TX: unknown CQE type %d\n", + cqe_oob->cqe_hdr.cqe_type); + - return; ++ break; } --- -2.40.1 - + if (WARN_ON_ONCE(txq->gdma_txq_id != completions[i].wq_num))