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

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

rt2x00: Fix transfer speed regression for USB hardware 



Patch:
  rt2x00: Make rt2x00_queue_entry_for_each more flexible
  commit: 10e11568

introduced a severe regression on the throughput
for USB hardware. It turns out that the exiting of
the rt2x00queue_for_each_entry() was done too early.

The exact cause for this regression is unknown,
but by disabling the premature exiting of the loop
seems to resolve the issue.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Reported-by: default avatarYasushi SHOJI <yashi@atmark-techno.com>
Reported-by: default avatarBalint Viragh <bviragh@dension.com>
Tested-by: default avatarBalint Viragh <bviragh@dension.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent aca355b9

drivers/net/wireless/rt2x00/rt2x00usb.c

+3 −3
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static bool rt2x00usb_kick_tx_entry(struct queue_entry *entry, void* data) 


	if (!test_and_clear_bit(ENTRY_DATA_PENDING, &entry->flags) ||

	    test_bit(ENTRY_DATA_STATUS_PENDING, &entry->flags))

		return true;

		return false;



	/*

	 * USB devices cannot blindly pass the skb->len as the
@@ -392,7 +392,7 @@ static bool rt2x00usb_kick_rx_entry(struct queue_entry *entry, void* data) 


	if (test_and_set_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags) ||

	    test_bit(ENTRY_DATA_STATUS_PENDING, &entry->flags))

		return true;

		return false;



	rt2x00lib_dmastart(entry);
@@ -447,7 +447,7 @@ static bool rt2x00usb_flush_entry(struct queue_entry *entry, void* data) 
	struct queue_entry_priv_usb_bcn *bcn_priv = entry->priv_data;



	if (!test_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags))

		return true;

		return false;



	usb_kill_urb(entry_priv->urb);