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

Commit 5c3b685c authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by Ivo van Doorn
Browse files

rt2x00: Push beacon TX descriptor writing to drivers. 



Not all the devices require a TX descriptor to be written (i.e. rt2800
device don't require them). Push down the creation of the TX descriptor
to the device drivers so that they can decide for themselves whether
a TX descriptor is to be created.

Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
parent ed3305b4

drivers/net/wireless/rt2x00/rt2400pci.c

+9 −6
Original line number Diff line number Diff line
@@ -1076,9 +1076,6 @@ static void rt2400pci_write_beacon(struct queue_entry *entry, 
				   struct txentry_desc *txdesc)

{

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

	struct queue_entry_priv_pci *entry_priv = entry->priv_data;

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

	u32 word;

	u32 reg;



	/*
@@ -1091,9 +1088,15 @@ static void rt2400pci_write_beacon(struct queue_entry *entry, 


	rt2x00queue_map_txskb(rt2x00dev, entry->skb);



	rt2x00_desc_read(entry_priv->desc, 1, &word);

	rt2x00_set_field32(&word, TXD_W1_BUFFER_ADDRESS, skbdesc->skb_dma);

	rt2x00_desc_write(entry_priv->desc, 1, word);

	/*

	 * Write the TX descriptor for the beacon.

	 */

	rt2400pci_write_tx_desc(rt2x00dev, entry->skb, txdesc);



	/*

	 * Dump beacon to userspace through debugfs.

	 */

	rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);



	/*

	 * Enable beaconing again.

drivers/net/wireless/rt2x00/rt2500pci.c

+9 −6
Original line number Diff line number Diff line
@@ -1233,9 +1233,6 @@ static void rt2500pci_write_beacon(struct queue_entry *entry, 
				   struct txentry_desc *txdesc)

{

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

	struct queue_entry_priv_pci *entry_priv = entry->priv_data;

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

	u32 word;

	u32 reg;



	/*
@@ -1248,9 +1245,15 @@ static void rt2500pci_write_beacon(struct queue_entry *entry, 


	rt2x00queue_map_txskb(rt2x00dev, entry->skb);



	rt2x00_desc_read(entry_priv->desc, 1, &word);

	rt2x00_set_field32(&word, TXD_W1_BUFFER_ADDRESS, skbdesc->skb_dma);

	rt2x00_desc_write(entry_priv->desc, 1, word);

	/*

	 * Write the TX descriptor for the beacon.

	 */

	rt2500pci_write_tx_desc(rt2x00dev, entry->skb, txdesc);



	/*

	 * Dump beacon to userspace through debugfs.

	 */

	rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);



	/*

	 * Enable beaconing again.

drivers/net/wireless/rt2x00/rt2500usb.c

+10 −0
Original line number Diff line number Diff line
@@ -1107,6 +1107,16 @@ static void rt2500usb_write_beacon(struct queue_entry *entry, 
	rt2x00_set_field16(&reg, TXRX_CSR19_BEACON_GEN, 0);

	rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg);



	/*

	 * Write the TX descriptor for the beacon.

	 */

	rt2500usb_write_tx_desc(rt2x00dev, entry->skb, txdesc);



	/*

	 * Dump beacon to userspace through debugfs.

	 */

	rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);



	/*

	 * Take the descriptor in front of the skb into account.

	 */

drivers/net/wireless/rt2x00/rt2800pci.c

+16 −0
Original line number Diff line number Diff line
@@ -688,6 +688,7 @@ 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;
@@ -699,10 +700,25 @@ static void rt2800pci_write_beacon(struct queue_entry *entry, 
	rt2x00_set_field32(&reg, BCN_TIME_CFG_BEACON_GEN, 0);

	rt2800_register_write(rt2x00dev, BCN_TIME_CFG, reg);



	/*

	 * Register descriptor details in skb frame descriptor.

	 */

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

	skbdesc->desc_len = TXWI_DESC_SIZE;



	/*

	 * Add the TXWI for the beacon to the skb.

	 */

	rt2800_write_txwi(entry->skb, txdesc);



	/*

	 * Dump beacon to userspace through debugfs.

	 */

	rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);



	/*

	 * Adjust skb to take TXWI into account.

	 */

	skb_push(entry->skb, TXWI_DESC_SIZE);



	/*

drivers/net/wireless/rt2x00/rt2800usb.c

+16 −0
Original line number Diff line number Diff line
@@ -437,6 +437,7 @@ 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;
@@ -448,10 +449,25 @@ 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);



	/*

	 * Register descriptor details in skb frame descriptor.

	 */

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

	skbdesc->desc_len = TXWI_DESC_SIZE;



	/*

	 * Add the TXWI for the beacon to the skb.

	 */

	rt2800_write_txwi(entry->skb, txdesc);



	/*

	 * Dump beacon to userspace through debugfs.

	 */

	rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);



	/*

	 * Adjust skb to take TXWI into account.

	 */

	skb_push(entry->skb, TXWI_DESC_SIZE);



	/*