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

Commit 64e7d723 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Cleanup RX index counting 



Add the rt2x00_dmastart function to rt2x00lib which
marks the queue_entry as "owned by device", and increased
the Q_INDEX number.

This cleanups up the index handling by rt2x00lib which
at until so far used hackish approaches to keep the
RX queue index numbering sane.

The rt2x00pci.c changes are from Helmut Schaa

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5be65609

drivers/net/wireless/rt2x00/rt2x00.h

+1 −0
Original line number Diff line number Diff line
@@ -1171,6 +1171,7 @@ static inline void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev, 
 */

void rt2x00lib_beacondone(struct rt2x00_dev *rt2x00dev);

void rt2x00lib_pretbtt(struct rt2x00_dev *rt2x00dev);

void rt2x00lib_dmastart(struct queue_entry *entry);

void rt2x00lib_dmadone(struct queue_entry *entry);

void rt2x00lib_txdone(struct queue_entry *entry,

		      struct txdone_entry_desc *txdesc);

drivers/net/wireless/rt2x00/rt2x00dev.c

+8 −3
Original line number Diff line number Diff line
@@ -226,6 +226,13 @@ void rt2x00lib_pretbtt(struct rt2x00_dev *rt2x00dev) 
}

EXPORT_SYMBOL_GPL(rt2x00lib_pretbtt);



void rt2x00lib_dmastart(struct queue_entry *entry)

{

	set_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags);

	rt2x00queue_index_inc(entry->queue, Q_INDEX);

}

EXPORT_SYMBOL_GPL(rt2x00lib_dmastart);



void rt2x00lib_dmadone(struct queue_entry *entry)

{

	clear_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags);
@@ -555,10 +562,8 @@ void rt2x00lib_rxdone(struct queue_entry *entry) 
	entry->flags = 0;

	rt2x00queue_index_inc(entry->queue, Q_INDEX_DONE);

	if (test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags) &&

	    test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags)) {

	    test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))

		rt2x00dev->ops->lib->clear_entry(entry);

		rt2x00queue_index_inc(entry->queue, Q_INDEX);

	}

}

EXPORT_SYMBOL_GPL(rt2x00lib_rxdone);

drivers/net/wireless/rt2x00/rt2x00pci.c

+7 −0
Original line number Diff line number Diff line
@@ -81,6 +81,13 @@ void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev) 
		skbdesc->desc = entry_priv->desc;

		skbdesc->desc_len = entry->queue->desc_size;



		/*

		 * DMA is already done, notify rt2x00lib that

		 * it finished successfully.

		 */

		rt2x00lib_dmastart(entry);

		rt2x00lib_dmadone(entry);



		/*

		 * Send the frame to rt2x00lib for further processing.

		 */

drivers/net/wireless/rt2x00/rt2x00queue.c

+1 −4
Original line number Diff line number Diff line
@@ -968,11 +968,8 @@ void rt2x00queue_init_queues(struct rt2x00_dev *rt2x00dev) 
	queue_for_each(rt2x00dev, queue) {

		rt2x00queue_reset(queue);



		for (i = 0; i < queue->limit; i++) {

		for (i = 0; i < queue->limit; i++)

			rt2x00dev->ops->lib->clear_entry(&queue->entries[i]);

			if (queue->qid == QID_RX)

				rt2x00queue_index_inc(queue, Q_INDEX);

		}

	}

}

drivers/net/wireless/rt2x00/rt2x00usb.c

+2 −0
Original line number Diff line number Diff line
@@ -330,6 +330,8 @@ static void rt2x00usb_kick_rx_entry(struct queue_entry *entry) 
	if (test_and_set_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags))

		return;



	rt2x00lib_dmastart(entry);



	usb_fill_bulk_urb(entry_priv->urb, usb_dev,

			  usb_rcvbulkpipe(usb_dev, entry->queue->usb_endpoint),

			  entry->skb->data, entry->skb->len,