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

Commit 7fe7ee77 authored by Helmut Schaa's avatar Helmut Schaa Committed by John W. Linville
Browse files

rt2x00: Generate sw sequence numbers only for devices that need it 



Newer devices like rt2800* own a hardware sequence counter and thus
don't need to use a software sequence counter at all. Add a new driver
flag to shortcut the software sequence number generation on devices that
don't need it.

rt61pci, rt73usb and rt2800* seem to make use of a hw sequence counter
while rt2400pci and rt2500* need to do it in software.

Signed-off-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 208f19dc

drivers/net/wireless/rt2x00/rt2400pci.c

+1 −0
Original line number Diff line number Diff line
@@ -1641,6 +1641,7 @@ static int rt2400pci_probe_hw(struct rt2x00_dev *rt2x00dev) 
	 */

	__set_bit(DRIVER_REQUIRE_ATIM_QUEUE, &rt2x00dev->flags);

	__set_bit(DRIVER_REQUIRE_DMA, &rt2x00dev->flags);

	__set_bit(DRIVER_REQUIRE_SW_SEQNO, &rt2x00dev->flags);



	/*

	 * Set the rssi offset.

drivers/net/wireless/rt2x00/rt2500pci.c

+1 −0
Original line number Diff line number Diff line
@@ -1959,6 +1959,7 @@ static int rt2500pci_probe_hw(struct rt2x00_dev *rt2x00dev) 
	 */

	__set_bit(DRIVER_REQUIRE_ATIM_QUEUE, &rt2x00dev->flags);

	__set_bit(DRIVER_REQUIRE_DMA, &rt2x00dev->flags);

	__set_bit(DRIVER_REQUIRE_SW_SEQNO, &rt2x00dev->flags);



	/*

	 * Set the rssi offset.

drivers/net/wireless/rt2x00/rt2500usb.c

+1 −0
Original line number Diff line number Diff line
@@ -1795,6 +1795,7 @@ static int rt2500usb_probe_hw(struct rt2x00_dev *rt2x00dev) 
		__set_bit(DRIVER_REQUIRE_COPY_IV, &rt2x00dev->flags);

	}

	__set_bit(DRIVER_SUPPORT_WATCHDOG, &rt2x00dev->flags);

	__set_bit(DRIVER_REQUIRE_SW_SEQNO, &rt2x00dev->flags);



	/*

	 * Set the rssi offset.

drivers/net/wireless/rt2x00/rt2x00.h

+1 −0
Original line number Diff line number Diff line
@@ -662,6 +662,7 @@ enum rt2x00_flags { 
	DRIVER_REQUIRE_L2PAD,

	DRIVER_REQUIRE_TXSTATUS_FIFO,

	DRIVER_REQUIRE_TASKLET_CONTEXT,

	DRIVER_REQUIRE_SW_SEQNO,



	/*

	 * Driver features

drivers/net/wireless/rt2x00/rt2x00queue.c

+7 −4
Original line number Diff line number Diff line
@@ -224,10 +224,14 @@ static void rt2x00queue_create_tx_descriptor_seq(struct queue_entry *entry, 
	if (!(tx_info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ))

		return;



	__set_bit(ENTRY_TXD_GENERATE_SEQ, &txdesc->flags);



	if (!test_bit(DRIVER_REQUIRE_SW_SEQNO, &entry->queue->rt2x00dev->flags))

		return;



	/*

	 * Hardware should insert sequence counter.

	 * FIXME: We insert a software sequence counter first for

	 * hardware that doesn't support hardware sequence counting.

	 * The hardware is not able to insert a sequence number. Assign a

	 * software generated one here.

	 *

	 * This is wrong because beacons are not getting sequence

	 * numbers assigned properly.
@@ -245,7 +249,6 @@ static void rt2x00queue_create_tx_descriptor_seq(struct queue_entry *entry, 


	spin_unlock_irqrestore(&intf->seqlock, irqflags);



	__set_bit(ENTRY_TXD_GENERATE_SEQ, &txdesc->flags);

}



static void rt2x00queue_create_tx_descriptor_plcp(struct queue_entry *entry,