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

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

rt2x00: Reorganize queue callback functions 



As part of the queue refactoring, change the queue callback
function names to have 3 different actions: start, kick & stop.

We can now also remove the STATE_RADIO_RX_ON/STATE_RADIO_RX_OFF
device_state flags, and replace the usage with using the
start_queue/stop_queue callback functions.
This streamlines the RX queue handling to the
similar approach as all other queues.

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

drivers/net/wireless/rt2x00/rt2400pci.c

+3 −8
Original line number Diff line number Diff line
@@ -1058,12 +1058,6 @@ static int rt2400pci_set_device_state(struct rt2x00_dev *rt2x00dev, 
	case STATE_RADIO_OFF:

		rt2400pci_disable_radio(rt2x00dev);

		break;

	case STATE_RADIO_RX_ON:

		rt2400pci_start_queue(rt2x00dev->rx);

		break;

	case STATE_RADIO_RX_OFF:

		rt2400pci_stop_queue(rt2x00dev->rx);

		break;

	case STATE_RADIO_IRQ_ON:

	case STATE_RADIO_IRQ_ON_ISR:

	case STATE_RADIO_IRQ_OFF:
@@ -1672,10 +1666,11 @@ static const struct rt2x00lib_ops rt2400pci_rt2x00_ops = { 
	.link_stats		= rt2400pci_link_stats,

	.reset_tuner		= rt2400pci_reset_tuner,

	.link_tuner		= rt2400pci_link_tuner,

	.start_queue		= rt2400pci_start_queue,

	.kick_queue		= rt2400pci_kick_queue,

	.stop_queue		= rt2400pci_stop_queue,

	.write_tx_desc		= rt2400pci_write_tx_desc,

	.write_beacon		= rt2400pci_write_beacon,

	.kick_tx_queue		= rt2400pci_kick_queue,

	.kill_tx_queue		= rt2400pci_stop_queue,

	.fill_rxdone		= rt2400pci_fill_rxdone,

	.config_filter		= rt2400pci_config_filter,

	.config_intf		= rt2400pci_config_intf,

drivers/net/wireless/rt2x00/rt2500pci.c

+3 −8
Original line number Diff line number Diff line
@@ -1213,12 +1213,6 @@ static int rt2500pci_set_device_state(struct rt2x00_dev *rt2x00dev, 
	case STATE_RADIO_OFF:

		rt2500pci_disable_radio(rt2x00dev);

		break;

	case STATE_RADIO_RX_ON:

		rt2500pci_start_queue(rt2x00dev->rx);

		break;

	case STATE_RADIO_RX_OFF:

		rt2500pci_stop_queue(rt2x00dev->rx);

		break;

	case STATE_RADIO_IRQ_ON:

	case STATE_RADIO_IRQ_ON_ISR:

	case STATE_RADIO_IRQ_OFF:
@@ -1969,10 +1963,11 @@ static const struct rt2x00lib_ops rt2500pci_rt2x00_ops = { 
	.link_stats		= rt2500pci_link_stats,

	.reset_tuner		= rt2500pci_reset_tuner,

	.link_tuner		= rt2500pci_link_tuner,

	.start_queue		= rt2500pci_start_queue,

	.kick_queue		= rt2500pci_kick_queue,

	.stop_queue		= rt2500pci_stop_queue,

	.write_tx_desc		= rt2500pci_write_tx_desc,

	.write_beacon		= rt2500pci_write_beacon,

	.kick_tx_queue		= rt2500pci_kick_queue,

	.kill_tx_queue		= rt2500pci_stop_queue,

	.fill_rxdone		= rt2500pci_fill_rxdone,

	.config_filter		= rt2500pci_config_filter,

	.config_intf		= rt2500pci_config_intf,

drivers/net/wireless/rt2x00/rt2500usb.c

+3 −8
Original line number Diff line number Diff line
@@ -1057,12 +1057,6 @@ static int rt2500usb_set_device_state(struct rt2x00_dev *rt2x00dev, 
	case STATE_RADIO_OFF:

		rt2500usb_disable_radio(rt2x00dev);

		break;

	case STATE_RADIO_RX_ON:

		rt2500usb_start_queue(rt2x00dev->rx);

		break;

	case STATE_RADIO_RX_OFF:

		rt2500usb_stop_queue(rt2x00dev->rx);

		break;

	case STATE_RADIO_IRQ_ON:

	case STATE_RADIO_IRQ_ON_ISR:

	case STATE_RADIO_IRQ_OFF:
@@ -1845,11 +1839,12 @@ static const struct rt2x00lib_ops rt2500usb_rt2x00_ops = { 
	.link_stats		= rt2500usb_link_stats,

	.reset_tuner		= rt2500usb_reset_tuner,

	.watchdog		= rt2x00usb_watchdog,

	.start_queue		= rt2500usb_start_queue,

	.kick_queue		= rt2x00usb_kick_queue,

	.stop_queue		= rt2500usb_stop_queue,

	.write_tx_desc		= rt2500usb_write_tx_desc,

	.write_beacon		= rt2500usb_write_beacon,

	.get_tx_data_len	= rt2500usb_get_tx_data_len,

	.kick_tx_queue		= rt2x00usb_kick_tx_queue,

	.kill_tx_queue		= rt2500usb_stop_queue,

	.fill_rxdone		= rt2500usb_fill_rxdone,

	.config_shared_key	= rt2500usb_config_key,

	.config_pairwise_key	= rt2500usb_config_key,

drivers/net/wireless/rt2x00/rt2800pci.c

+3 −8
Original line number Diff line number Diff line
@@ -537,12 +537,6 @@ static int rt2800pci_set_device_state(struct rt2x00_dev *rt2x00dev, 
		rt2800pci_disable_radio(rt2x00dev);

		rt2800pci_set_state(rt2x00dev, STATE_SLEEP);

		break;

	case STATE_RADIO_RX_ON:

		rt2800pci_start_queue(rt2x00dev->rx);

		break;

	case STATE_RADIO_RX_OFF:

		rt2800pci_stop_queue(rt2x00dev->rx);

		break;

	case STATE_RADIO_IRQ_ON:

	case STATE_RADIO_IRQ_ON_ISR:

	case STATE_RADIO_IRQ_OFF:
@@ -1004,11 +998,12 @@ static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = { 
	.link_stats		= rt2800_link_stats,

	.reset_tuner		= rt2800_reset_tuner,

	.link_tuner		= rt2800_link_tuner,

	.start_queue		= rt2800pci_start_queue,

	.kick_queue		= rt2800pci_kick_queue,

	.stop_queue		= rt2800pci_stop_queue,

	.write_tx_desc		= rt2800pci_write_tx_desc,

	.write_tx_data		= rt2800_write_tx_data,

	.write_beacon		= rt2800_write_beacon,

	.kick_tx_queue		= rt2800pci_kick_queue,

	.kill_tx_queue		= rt2800pci_stop_queue,

	.fill_rxdone		= rt2800pci_fill_rxdone,

	.config_shared_key	= rt2800_config_shared_key,

	.config_pairwise_key	= rt2800_config_pairwise_key,

drivers/net/wireless/rt2x00/rt2800usb.c

+3 −8
Original line number Diff line number Diff line
@@ -254,12 +254,6 @@ static int rt2800usb_set_device_state(struct rt2x00_dev *rt2x00dev, 
		rt2800usb_disable_radio(rt2x00dev);

		rt2800usb_set_state(rt2x00dev, STATE_SLEEP);

		break;

	case STATE_RADIO_RX_ON:

		rt2800usb_start_queue(rt2x00dev->rx);

		break;

	case STATE_RADIO_RX_OFF:

		rt2800usb_stop_queue(rt2x00dev->rx);

		break;

	case STATE_RADIO_IRQ_ON:

	case STATE_RADIO_IRQ_ON_ISR:

	case STATE_RADIO_IRQ_OFF:
@@ -626,12 +620,13 @@ static const struct rt2x00lib_ops rt2800usb_rt2x00_ops = { 
	.reset_tuner		= rt2800_reset_tuner,

	.link_tuner		= rt2800_link_tuner,

	.watchdog		= rt2800usb_watchdog,

	.start_queue		= rt2800usb_start_queue,

	.kick_queue		= rt2x00usb_kick_queue,

	.stop_queue		= rt2800usb_stop_queue,

	.write_tx_desc		= rt2800usb_write_tx_desc,

	.write_tx_data		= rt2800usb_write_tx_data,

	.write_beacon		= rt2800_write_beacon,

	.get_tx_data_len	= rt2800usb_get_tx_data_len,

	.kick_tx_queue		= rt2x00usb_kick_tx_queue,

	.kill_tx_queue		= rt2800usb_stop_queue,

	.fill_rxdone		= rt2800usb_fill_rxdone,

	.config_shared_key	= rt2800_config_shared_key,

	.config_pairwise_key	= rt2800_config_pairwise_key,