Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79d2b29e authored by Ron Mercer's avatar Ron Mercer Committed by David S. Miller
Browse files

qlge: bugfix: Add missing rx buf clean index on early exit. 



The large receive buffer queue is not properly tracking the current
index in the case where an early exit occurs.  This can happen when a
page alloc or dma mapping fails.  If this occurs the queue will get
out of sync and invalid indexes can be written to the hardware.

Signed-off-by: default avatarRon Mercer <ron.mercer@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent def48b6e

drivers/net/qlge/qlge_main.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -898,6 +898,7 @@ static void ql_update_lbq(struct ql_adapter *qdev, struct rx_ring *rx_ring) 
					lbq_desc->index);

					lbq_desc->index);

				lbq_desc->p.lbq_page = alloc_page(GFP_ATOMIC);

				lbq_desc->p.lbq_page = alloc_page(GFP_ATOMIC);

				if (lbq_desc->p.lbq_page == NULL) {

				if (lbq_desc->p.lbq_page == NULL) {

					rx_ring->lbq_clean_idx = clean_idx;

					QPRINTK(qdev, RX_STATUS, ERR,

					QPRINTK(qdev, RX_STATUS, ERR,

						"Couldn't get a page.\n");

						"Couldn't get a page.\n");

					return;

					return;
@@ -907,6 +908,7 @@ static void ql_update_lbq(struct ql_adapter *qdev, struct rx_ring *rx_ring) 
						   0, PAGE_SIZE,

						   0, PAGE_SIZE,

						   PCI_DMA_FROMDEVICE);

						   PCI_DMA_FROMDEVICE);

				if (pci_dma_mapping_error(qdev->pdev, map)) {

				if (pci_dma_mapping_error(qdev->pdev, map)) {

					rx_ring->lbq_clean_idx = clean_idx;

					put_page(lbq_desc->p.lbq_page);

					put_page(lbq_desc->p.lbq_page);

					lbq_desc->p.lbq_page = NULL;

					lbq_desc->p.lbq_page = NULL;

					QPRINTK(qdev, RX_STATUS, ERR,

					QPRINTK(qdev, RX_STATUS, ERR,