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

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

rt2x00: Add kill_tx_queue callback function 



provide rt2x00lib the possibility to kill a particular TX queue.
This can be useful when disabling the radio, but more importantly
will allow beaconing to be disabled when mac80211 requests this
(during scanning for example)

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 382fe0f2

drivers/net/wireless/rt2x00/rt2400pci.c

+17 −13
Original line number Diff line number Diff line
@@ -934,21 +934,10 @@ static int rt2400pci_enable_radio(struct rt2x00_dev *rt2x00dev) 


static void rt2400pci_disable_radio(struct rt2x00_dev *rt2x00dev)

{

	u32 reg;



	rt2x00pci_register_write(rt2x00dev, PWRCSR0, 0);



	/*

	 * Disable synchronisation.

	 */

	rt2x00pci_register_write(rt2x00dev, CSR14, 0);



	/*

	 * Cancel RX and TX.

	 * Disable power

	 */

	rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);

	rt2x00_set_field32(&reg, TXCSR0_ABORT, 1);

	rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);

	rt2x00pci_register_write(rt2x00dev, PWRCSR0, 0);

}



static int rt2400pci_set_state(struct rt2x00_dev *rt2x00dev,
@@ -1145,6 +1134,20 @@ static void rt2400pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev, 
	rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);

}



static void rt2400pci_kill_tx_queue(struct rt2x00_dev *rt2x00dev,

				    const enum data_queue_qid qid)

{

	u32 reg;



	if (qid == QID_BEACON) {

		rt2x00pci_register_write(rt2x00dev, CSR14, 0);

	} else {

		rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);

		rt2x00_set_field32(&reg, TXCSR0_ABORT, 1);

		rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);

	}

}



/*

 * RX control handlers

 */
@@ -1606,6 +1609,7 @@ static const struct rt2x00lib_ops rt2400pci_rt2x00_ops = { 
	.write_tx_data		= rt2x00pci_write_tx_data,

	.write_beacon		= rt2400pci_write_beacon,

	.kick_tx_queue		= rt2400pci_kick_tx_queue,

	.kill_tx_queue		= rt2400pci_kill_tx_queue,

	.fill_rxdone		= rt2400pci_fill_rxdone,

	.config_filter		= rt2400pci_config_filter,

	.config_intf		= rt2400pci_config_intf,

drivers/net/wireless/rt2x00/rt2500pci.c

+17 −13
Original line number Diff line number Diff line
@@ -1093,21 +1093,10 @@ static int rt2500pci_enable_radio(struct rt2x00_dev *rt2x00dev) 


static void rt2500pci_disable_radio(struct rt2x00_dev *rt2x00dev)

{

	u32 reg;



	rt2x00pci_register_write(rt2x00dev, PWRCSR0, 0);



	/*

	 * Disable synchronisation.

	 */

	rt2x00pci_register_write(rt2x00dev, CSR14, 0);



	/*

	 * Cancel RX and TX.

	 * Disable power

	 */

	rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);

	rt2x00_set_field32(&reg, TXCSR0_ABORT, 1);

	rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);

	rt2x00pci_register_write(rt2x00dev, PWRCSR0, 0);

}



static int rt2500pci_set_state(struct rt2x00_dev *rt2x00dev,
@@ -1303,6 +1292,20 @@ static void rt2500pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev, 
	rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);

}



static void rt2500pci_kill_tx_queue(struct rt2x00_dev *rt2x00dev,

				    const enum data_queue_qid qid)

{

	u32 reg;



	if (qid == QID_BEACON) {

		rt2x00pci_register_write(rt2x00dev, CSR14, 0);

	} else {

		rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);

		rt2x00_set_field32(&reg, TXCSR0_ABORT, 1);

		rt2x00pci_register_write(rt2x00dev, TXCSR0, reg);

	}

}



/*

 * RX control handlers

 */
@@ -1905,6 +1908,7 @@ static const struct rt2x00lib_ops rt2500pci_rt2x00_ops = { 
	.write_tx_data		= rt2x00pci_write_tx_data,

	.write_beacon		= rt2500pci_write_beacon,

	.kick_tx_queue		= rt2500pci_kick_tx_queue,

	.kill_tx_queue		= rt2500pci_kill_tx_queue,

	.fill_rxdone		= rt2500pci_fill_rxdone,

	.config_filter		= rt2500pci_config_filter,

	.config_intf		= rt2500pci_config_intf,

drivers/net/wireless/rt2x00/rt2500usb.c

+1 −0
Original line number Diff line number Diff line
@@ -1935,6 +1935,7 @@ static const struct rt2x00lib_ops rt2500usb_rt2x00_ops = { 
	.write_beacon		= rt2500usb_write_beacon,

	.get_tx_data_len	= rt2500usb_get_tx_data_len,

	.kick_tx_queue		= rt2500usb_kick_tx_queue,

	.kill_tx_queue		= rt2x00usb_kill_tx_queue,

	.fill_rxdone		= rt2500usb_fill_rxdone,

	.config_shared_key	= rt2500usb_config_key,

	.config_pairwise_key	= rt2500usb_config_key,

drivers/net/wireless/rt2x00/rt2x00.h

+2 −0
Original line number Diff line number Diff line
@@ -508,6 +508,8 @@ struct rt2x00lib_ops { 
	int (*get_tx_data_len) (struct queue_entry *entry);

	void (*kick_tx_queue) (struct rt2x00_dev *rt2x00dev,

			       const enum data_queue_qid queue);

	void (*kill_tx_queue) (struct rt2x00_dev *rt2x00dev,

			       const enum data_queue_qid queue);



	/*

	 * RX control handlers

drivers/net/wireless/rt2x00/rt2x00dev.c

+3 −2
Original line number Diff line number Diff line
@@ -83,9 +83,10 @@ void rt2x00lib_disable_radio(struct rt2x00_dev *rt2x00dev) 
		return;



	/*

	 * Stop the TX queues.

	 * Stop the TX queues in mac80211.

	 */

	ieee80211_stop_queues(rt2x00dev->hw);

	rt2x00queue_stop_queues(rt2x00dev);



	/*

	 * Disable RX.
@@ -157,7 +158,7 @@ static void rt2x00lib_intf_scheduled_iter(void *data, u8 *mac, 
		return;



	if (delayed_flags & DELAYED_UPDATE_BEACON)

		rt2x00queue_update_beacon(rt2x00dev, vif);

		rt2x00queue_update_beacon(rt2x00dev, vif, true);



	if (delayed_flags & DELAYED_CONFIG_ERP)

		rt2x00lib_config_erp(rt2x00dev, intf, &conf);