Commit 3b9f0ed7 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Fix beaconing on rt2800. 



According to the Ralink vendor driver for rt2800 we don't need a full
TXD for a beacon but just a TXWI in front of the actual beacon.
Fix the rt2800pci and rt2800usb beaconing code accordingly.

Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f224f4ef

drivers/net/wireless/rt2x00/rt2800pci.c

+9 −8
Original line number Diff line number Diff line
@@ -682,7 +682,6 @@ static void rt2800pci_write_beacon(struct queue_entry *entry, 
				   struct txentry_desc *txdesc)

{

	struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);

	unsigned int beacon_base;

	u32 reg;
@@ -695,14 +694,16 @@ static void rt2800pci_write_beacon(struct queue_entry *entry, 
	rt2800_register_write(rt2x00dev, BCN_TIME_CFG, reg);



	/*

	 * Write entire beacon with descriptor to register.

	 * Add the TXWI for the beacon to the skb.

	 */

	rt2800_write_txwi(entry->skb, txdesc);

	skb_push(entry->skb, TXWI_DESC_SIZE);



	/*

	 * Write entire beacon with TXWI to register.

	 */

	beacon_base = HW_BEACON_OFFSET(entry->entry_idx);

	rt2800_register_multiwrite(rt2x00dev,

				      beacon_base,

				      skbdesc->desc, skbdesc->desc_len);

	rt2800_register_multiwrite(rt2x00dev,

				      beacon_base + skbdesc->desc_len,

	rt2800_register_multiwrite(rt2x00dev, beacon_base,

				   entry->skb->data, entry->skb->len);



	/*

drivers/net/wireless/rt2x00/rt2800usb.c

+6 −8
Original line number Diff line number Diff line
@@ -431,17 +431,9 @@ static void rt2800usb_write_beacon(struct queue_entry *entry, 
				   struct txentry_desc *txdesc)

{

	struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);

	unsigned int beacon_base;

	u32 reg;



	/*

	 * Add the descriptor in front of the skb.

	 */

	skb_push(entry->skb, entry->queue->desc_size);

	memcpy(entry->skb->data, skbdesc->desc, skbdesc->desc_len);

	skbdesc->desc = entry->skb->data;



	/*

	 * Disable beaconing while we are reloading the beacon data,

	 * otherwise we might be sending out invalid data.
@@ -450,6 +442,12 @@ static void rt2800usb_write_beacon(struct queue_entry *entry, 
	rt2x00_set_field32(&reg, BCN_TIME_CFG_BEACON_GEN, 0);

	rt2800_register_write(rt2x00dev, BCN_TIME_CFG, reg);



	/*

	 * Add the TXWI for the beacon to the skb.

	 */

	rt2800_write_txwi(entry->skb, txdesc);

	skb_push(entry->skb, TXWI_DESC_SIZE);



	/*

	 * Write entire beacon with descriptor to register.

	 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE