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

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

rt2x00: Fix race conditions in flag handling 



Some of the flags should be accessed atomically to
prevent race conditions. The flags that are most important
are those that can change often and indicate the actual
state of the device, queue or queue entry.

The big flag rename was done to move all state flags to
the same naming type as the other rt2x00dev flags and
made sure all places where the flags were used were changed. ;)

Thanks to Stephen for most of the queue flags updates,
which fixes some of the most obvious consequences of the
race conditions. Among those the notorious:

rt2x00queue_write_tx_frame: Error - Arrived at non-free entry in the non-full queue 0.
rt2x00queue_write_tx_frame: Error - Arrived at non-free entry in the non-full queue 0.
rt2x00queue_write_tx_frame: Error - Arrived at non-free entry in the non-full queue 0.

Signed-off-by: default avatarStephen Blackheath <tramp.enshrine.stephen@blacksapphire.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent de9cc7a4

drivers/net/wireless/rt2x00/rt2400pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1241,7 +1241,7 @@ static irqreturn_t rt2400pci_interrupt(int irq, void *dev_instance) 
	if (!reg)

		return IRQ_NONE;



	if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags))

	if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))

		return IRQ_HANDLED;



	/*

drivers/net/wireless/rt2x00/rt2500pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1377,7 +1377,7 @@ static irqreturn_t rt2500pci_interrupt(int irq, void *dev_instance) 
	if (!reg)

		return IRQ_NONE;



	if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags))

	if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))

		return IRQ_HANDLED;



	/*

drivers/net/wireless/rt2x00/rt2500usb.c

+1 −1
Original line number Diff line number Diff line
@@ -1297,7 +1297,7 @@ static void rt2500usb_beacondone(struct urb *urb) 
	struct queue_entry *entry = (struct queue_entry *)urb->context;

	struct queue_entry_priv_usb_bcn *bcn_priv = entry->priv_data;



	if (!test_bit(DEVICE_ENABLED_RADIO, &entry->queue->rt2x00dev->flags))

	if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &entry->queue->rt2x00dev->flags))

		return;



	/*

drivers/net/wireless/rt2x00/rt2x00.h

+8 −8
Original line number Diff line number Diff line
@@ -629,14 +629,14 @@ enum rt2x00_flags { 
	/*

	 * Device state flags

	 */

	DEVICE_PRESENT,

	DEVICE_REGISTERED_HW,

	DEVICE_INITIALIZED,

	DEVICE_STARTED,

	DEVICE_STARTED_SUSPEND,

	DEVICE_ENABLED_RADIO,

	DEVICE_DISABLED_RADIO_HW,

	DEVICE_DIRTY_CONFIG,

	DEVICE_STATE_PRESENT,

	DEVICE_STATE_REGISTERED_HW,

	DEVICE_STATE_INITIALIZED,

	DEVICE_STATE_STARTED,

	DEVICE_STATE_STARTED_SUSPEND,

	DEVICE_STATE_ENABLED_RADIO,

	DEVICE_STATE_DISABLED_RADIO_HW,

	DEVICE_STATE_DIRTY_CONFIG,



	/*

	 * Driver requirements

drivers/net/wireless/rt2x00/rt2x00config.c

+2 −2
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev, 
	 * Antenna setup changes require the RX to be disabled,

	 * else the changes will be ignored by the device.

	 */

	if (test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags))

	if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))

		rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF_LINK);



	/*
@@ -136,7 +136,7 @@ void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev, 
	rt2x00dev->link.ant.active.rx = libconf.ant.rx;

	rt2x00dev->link.ant.active.tx = libconf.ant.tx;



	if (test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags))

	if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))

		rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON_LINK);

}