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 d47d5755bbc1af8502218300388d087a0b49a8da..13b7e65aefde53dffbfaad2264adcfb2e4a4918d 100644 (file)
--- 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 <shradhagupta@linux.microsoft.com>
 Signed-off-by: Paolo Abeni <pabeni@redhat.com>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- 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))