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

rt2x00: Clean up all driver's kick_tx_queue callback functions. 



All of the driver's kick_tx_queue callback functions treat the TX queue
for beacons in a special manner.
Clean this up by integrating the kicking of the beacon queue into the
write_beacon callback function, and let the generic code no longer call
the kick_tx_queue callback function when updating the beacon.

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 2de64dd2

drivers/net/wireless/rt2x00/rt2400pci.c

+8 −11
Original line number Diff line number Diff line
@@ -1089,23 +1089,20 @@ static void rt2400pci_write_beacon(struct queue_entry *entry) 
	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);

}



static void rt2400pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,

				    const enum data_queue_qid queue)

{

	u32 reg;



	if (queue == QID_BEACON) {

		rt2x00pci_register_read(rt2x00dev, CSR14, &reg);

		if (!rt2x00_get_field32(reg, CSR14_BEACON_GEN)) {

	/*

	 * Enable beaconing again.

	 */

	rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);

	rt2x00_set_field32(&reg, CSR14_TBCN, 1);

	rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 1);

	rt2x00pci_register_write(rt2x00dev, CSR14, reg);

}

		return;

	}



static void rt2400pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,

				    const enum data_queue_qid queue)

{

	u32 reg;



	rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);

	rt2x00_set_field32(&reg, TXCSR0_KICK_PRIO, (queue == QID_AC_BE));

drivers/net/wireless/rt2x00/rt2500pci.c

+8 −11
Original line number Diff line number Diff line
@@ -1246,23 +1246,20 @@ static void rt2500pci_write_beacon(struct queue_entry *entry) 
	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);

}



static void rt2500pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,

				    const enum data_queue_qid queue)

{

	u32 reg;



	if (queue == QID_BEACON) {

		rt2x00pci_register_read(rt2x00dev, CSR14, &reg);

		if (!rt2x00_get_field32(reg, CSR14_BEACON_GEN)) {

	/*

	 * Enable beaconing again.

	 */

	rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);

	rt2x00_set_field32(&reg, CSR14_TBCN, 1);

	rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 1);

	rt2x00pci_register_write(rt2x00dev, CSR14, reg);

}

		return;

	}



static void rt2500pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,

				    const enum data_queue_qid queue)

{

	u32 reg;



	rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);

	rt2x00_set_field32(&reg, TXCSR0_KICK_PRIO, (queue == QID_AC_BE));

drivers/net/wireless/rt2x00/rt2500usb.c

+22 −33
Original line number Diff line number Diff line
@@ -1090,7 +1090,7 @@ static void rt2500usb_write_beacon(struct queue_entry *entry) 
	struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);

	int pipe = usb_sndbulkpipe(usb_dev, entry->queue->usb_endpoint);

	int length;

	u16 reg;

	u16 reg, reg0;



	/*

	 * Add the descriptor in front of the skb.
@@ -1132,34 +1132,10 @@ static void rt2500usb_write_beacon(struct queue_entry *entry) 
	 * Send out the guardian byte.

	 */

	usb_submit_urb(bcn_priv->guardian_urb, GFP_ATOMIC);

}



static int rt2500usb_get_tx_data_len(struct queue_entry *entry)

{

	int length;



	/*

	 * The length _must_ be a multiple of 2,

	 * but it must _not_ be a multiple of the USB packet size.

	 * Enable beaconing again.

	 */

	length = roundup(entry->skb->len, 2);

	length += (2 * !(length % entry->queue->usb_maxpacket));



	return length;

}



static void rt2500usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev,

				    const enum data_queue_qid queue)

{

	u16 reg, reg0;



	if (queue != QID_BEACON) {

		rt2x00usb_kick_tx_queue(rt2x00dev, queue);

		return;

	}



	rt2500usb_register_read(rt2x00dev, TXRX_CSR19, &reg);

	if (!rt2x00_get_field16(reg, TXRX_CSR19_BEACON_GEN)) {

	rt2x00_set_field16(&reg, TXRX_CSR19_TSF_COUNT, 1);

	rt2x00_set_field16(&reg, TXRX_CSR19_TBCN, 1);

	reg0 = reg;
@@ -1177,6 +1153,19 @@ static void rt2500usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev, 
	rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg0);

	rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg);

}



static int rt2500usb_get_tx_data_len(struct queue_entry *entry)

{

	int length;



	/*

	 * The length _must_ be a multiple of 2,

	 * but it must _not_ be a multiple of the USB packet size.

	 */

	length = roundup(entry->skb->len, 2);

	length += (2 * !(length % entry->queue->usb_maxpacket));



	return length;

}



/*
@@ -1777,7 +1766,7 @@ static const struct rt2x00lib_ops rt2500usb_rt2x00_ops = { 
	.write_tx_data		= rt2x00usb_write_tx_data,

	.write_beacon		= rt2500usb_write_beacon,

	.get_tx_data_len	= rt2500usb_get_tx_data_len,

	.kick_tx_queue		= rt2500usb_kick_tx_queue,

	.kick_tx_queue		= rt2x00usb_kick_tx_queue,

	.kill_tx_queue		= rt2x00usb_kill_tx_queue,

	.fill_rxdone		= rt2500usb_fill_rxdone,

	.config_shared_key	= rt2500usb_config_key,

drivers/net/wireless/rt2x00/rt2800pci.c

+8 −12
Original line number Diff line number Diff line
@@ -704,6 +704,14 @@ static void rt2800pci_write_beacon(struct queue_entry *entry) 
				      beacon_base + skbdesc->desc_len,

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



	/*

	 * Enable beaconing again.

	 */

	rt2x00_set_field32(&reg, BCN_TIME_CFG_TSF_TICKING, 1);

	rt2x00_set_field32(&reg, BCN_TIME_CFG_TBTT_ENABLE, 1);

	rt2x00_set_field32(&reg, BCN_TIME_CFG_BEACON_GEN, 1);

	rt2800_register_write(rt2x00dev, BCN_TIME_CFG, reg);



	/*

	 * Clean up beacon skb.

	 */
@@ -716,18 +724,6 @@ static void rt2800pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev, 
{

	struct data_queue *queue;

	unsigned int idx, qidx = 0;

	u32 reg;



	if (queue_idx == QID_BEACON) {

		rt2800_register_read(rt2x00dev, BCN_TIME_CFG, &reg);

		if (!rt2x00_get_field32(reg, BCN_TIME_CFG_BEACON_GEN)) {

			rt2x00_set_field32(&reg, BCN_TIME_CFG_TSF_TICKING, 1);

			rt2x00_set_field32(&reg, BCN_TIME_CFG_TBTT_ENABLE, 1);

			rt2x00_set_field32(&reg, BCN_TIME_CFG_BEACON_GEN, 1);

			rt2800_register_write(rt2x00dev, BCN_TIME_CFG, reg);

		}

		return;

	}



	if (queue_idx > QID_HCCA && queue_idx != QID_MGMT)

		return;

drivers/net/wireless/rt2x00/rt2800usb.c

+9 −20
Original line number Diff line number Diff line
@@ -458,6 +458,14 @@ static void rt2800usb_write_beacon(struct queue_entry *entry) 
					    entry->skb->data, entry->skb->len,

					    REGISTER_TIMEOUT32(entry->skb->len));



	/*

	 * Enable beaconing again.

	 */

	rt2x00_set_field32(&reg, BCN_TIME_CFG_TSF_TICKING, 1);

	rt2x00_set_field32(&reg, BCN_TIME_CFG_TBTT_ENABLE, 1);

	rt2x00_set_field32(&reg, BCN_TIME_CFG_BEACON_GEN, 1);

	rt2800_register_write(rt2x00dev, BCN_TIME_CFG, reg);



	/*

	 * Clean up the beacon skb.

	 */
@@ -480,25 +488,6 @@ static int rt2800usb_get_tx_data_len(struct queue_entry *entry) 
	return length;

}



static void rt2800usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev,

				    const enum data_queue_qid queue)

{

	u32 reg;



	if (queue != QID_BEACON) {

		rt2x00usb_kick_tx_queue(rt2x00dev, queue);

		return;

	}



	rt2800_register_read(rt2x00dev, BCN_TIME_CFG, &reg);

	if (!rt2x00_get_field32(reg, BCN_TIME_CFG_BEACON_GEN)) {

		rt2x00_set_field32(&reg, BCN_TIME_CFG_TSF_TICKING, 1);

		rt2x00_set_field32(&reg, BCN_TIME_CFG_TBTT_ENABLE, 1);

		rt2x00_set_field32(&reg, BCN_TIME_CFG_BEACON_GEN, 1);

		rt2800_register_write(rt2x00dev, BCN_TIME_CFG, reg);

	}

}



/*

 * RX control handlers

 */
@@ -667,7 +656,7 @@ static const struct rt2x00lib_ops rt2800usb_rt2x00_ops = { 
	.write_tx_data		= rt2x00usb_write_tx_data,

	.write_beacon		= rt2800usb_write_beacon,

	.get_tx_data_len	= rt2800usb_get_tx_data_len,

	.kick_tx_queue		= rt2800usb_kick_tx_queue,

	.kick_tx_queue		= rt2x00usb_kick_tx_queue,

	.kill_tx_queue		= rt2x00usb_kill_tx_queue,

	.fill_rxdone		= rt2800usb_fill_rxdone,

	.config_shared_key	= rt2800_config_shared_key,

CRA Git | Maintained and supported by SUSTech CRA and CCSE