Commit d5eddde5 authored by Shannon Nelson's avatar Shannon Nelson Committed by David S. Miller
Browse files

ionic: check for queues before deleting 



Make sure the queue structures exist before trying
to delete them.  This addresses a couple of error
recovery issues.

Signed-off-by: default avatarShannon Nelson <snelson@pensando.io>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f9c00e2c

drivers/net/ethernet/pensando/ionic/ionic_lif.c

+38 −19
Original line number Diff line number Diff line
@@ -1437,43 +1437,62 @@ static void ionic_txrx_disable(struct ionic_lif *lif) 
	unsigned int i;

	int err;



	if (lif->txqcqs) {

		for (i = 0; i < lif->nxqs; i++) {

			err = ionic_qcq_disable(lif->txqcqs[i].qcq);

			if (err == -ETIMEDOUT)

				break;

		}

	}



	if (lif->rxqcqs) {

		for (i = 0; i < lif->nxqs; i++) {

			err = ionic_qcq_disable(lif->rxqcqs[i].qcq);

			if (err == -ETIMEDOUT)

				break;

		}

	}

}



static void ionic_txrx_deinit(struct ionic_lif *lif)

{

	unsigned int i;



	if (lif->txqcqs) {

		for (i = 0; i < lif->nxqs; i++) {

			ionic_lif_qcq_deinit(lif, lif->txqcqs[i].qcq);

			ionic_tx_flush(&lif->txqcqs[i].qcq->cq);

			ionic_tx_empty(&lif->txqcqs[i].qcq->q);

		}

	}



	if (lif->rxqcqs) {

		for (i = 0; i < lif->nxqs; i++) {

			ionic_lif_qcq_deinit(lif, lif->rxqcqs[i].qcq);

			ionic_rx_flush(&lif->rxqcqs[i].qcq->cq);

			ionic_rx_empty(&lif->rxqcqs[i].qcq->q);

		}

	}

}



static void ionic_txrx_free(struct ionic_lif *lif)

{

	unsigned int i;



	if (lif->txqcqs) {

		for (i = 0; i < lif->nxqs; i++) {

			ionic_qcq_free(lif, lif->txqcqs[i].qcq);

			lif->txqcqs[i].qcq = NULL;

		}

	}



	if (lif->rxqcqs) {

		for (i = 0; i < lif->nxqs; i++) {

			ionic_qcq_free(lif, lif->rxqcqs[i].qcq);

			lif->rxqcqs[i].qcq = NULL;

		}

	}

}



static int ionic_txrx_alloc(struct ionic_lif *lif)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE