diff --cc drivers/net/ethernet/microsoft/mana/mana_en.c
index 82f1461a48e9,c9b1df1ed109..2c6402dba5bb
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@@ -3329,22 -3294,35 +3336,35 @@@ static int mana_dealloc_queues(struct n
  	 * number of queues.
  	 */
  
- 	for (i = 0; i < apc->num_queues; i++) {
- 		txq = &apc->tx_qp[i]->txq;
- 		tsleep = 1000;
- 		while (atomic_read(&txq->pending_sends) > 0 &&
- 		       time_before(jiffies, timeout)) {
- 			usleep_range(tsleep, tsleep + 1000);
- 			tsleep <<= 1;
- 		}
- 		if (atomic_read(&txq->pending_sends)) {
- 			err = pcie_flr(to_pci_dev(gd->gdma_context->dev));
- 			if (err) {
- 				netdev_err(ndev, "flr failed %d with %d pkts pending in txq %u\n",
- 					   err, atomic_read(&txq->pending_sends),
- 					   txq->gdma_txq_id);
+ 	if (apc->tx_qp) {
+ 		for (i = 0; i < apc->num_queues; i++) {
 -			txq = &apc->tx_qp[i].txq;
++			txq = &apc->tx_qp[i]->txq;
+ 			tsleep = 1000;
+ 			while (atomic_read(&txq->pending_sends) > 0 &&
+ 			       time_before(jiffies, timeout)) {
+ 				usleep_range(tsleep, tsleep + 1000);
+ 				tsleep <<= 1;
  			}
- 			break;
+ 			if (atomic_read(&txq->pending_sends)) {
+ 				err =
+ 				    pcie_flr(to_pci_dev(gd->gdma_context->dev));
+ 				if (err) {
+ 					netdev_err(ndev, "flr failed %d with %d pkts pending in txq %u\n",
+ 						   err,
+ 					    atomic_read(&txq->pending_sends),
+ 					    txq->gdma_txq_id);
+ 				}
+ 				break;
+ 			}
+ 		}
+ 
+ 		for (i = 0; i < apc->num_queues; i++) {
+ 			txq = &apc->tx_qp[i].txq;
+ 			while ((skb = skb_dequeue(&txq->pending_skbs))) {
+ 				mana_unmap_skb(skb, apc);
+ 				dev_kfree_skb_any(skb);
+ 			}
+ 			atomic_set(&txq->pending_sends, 0);
  		}
  	}