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

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

rt2x00: Fix queue related oops in case of deselected mac80211 multi-queue feature. 



With the integration of the mac80211 multiqueue patches it has become possible that the
mac80211 layer modifies the number of TX queues that is stored inside the ieee80211_hw
structure, especially when multi-queue is not selected.

The rt2x00 drivers are not well suited to handle that situation, as they allocate the
queue structures before mac80211 has modified the number of queues it is going to use,
and also expect the number of allocated queues to match the hardware implementation.

Hence, ensure that rt2x00 maintains by itself the number of queues that the hardware
supports, and, at the same time, making is not dependent on the preservation of contents
inside a mac80211 structure.

Signed-off-by: default avatarGertjan van Wingerde <gwingerde@kpnplanet.nl>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 61486e0f

drivers/net/wireless/rt2x00/rt2400pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1373,7 +1373,6 @@ static void rt2400pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) 
	rt2x00dev->hw->flags = IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |

			       IEEE80211_HW_SIGNAL_DBM;

	rt2x00dev->hw->extra_tx_headroom = 0;

	rt2x00dev->hw->queues = 2;



	SET_IEEE80211_DEV(rt2x00dev->hw, &rt2x00dev_pci(rt2x00dev)->dev);

	SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
@@ -1620,6 +1619,7 @@ static const struct rt2x00_ops rt2400pci_ops = { 
	.max_ap_intf	= 1,

	.eeprom_size	= EEPROM_SIZE,

	.rf_size	= RF_SIZE,

	.tx_queues	= NUM_TX_QUEUES,

	.rx		= &rt2400pci_queue_rx,

	.tx		= &rt2400pci_queue_tx,

	.bcn		= &rt2400pci_queue_bcn,

drivers/net/wireless/rt2x00/rt2400pci.h

+5 −0
Original line number Diff line number Diff line
@@ -51,6 +51,11 @@ 
#define BBP_SIZE			0x0020

#define RF_SIZE				0x0010



/*

 * Number of TX queues.

 */

#define NUM_TX_QUEUES			2



/*

 * Control/Status Registers(CSR).

 * Some values are set in TU, whereas 1 TU == 1024 us.

drivers/net/wireless/rt2x00/rt2500pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1692,7 +1692,6 @@ static void rt2500pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) 
			       IEEE80211_HW_SIGNAL_DBM;



	rt2x00dev->hw->extra_tx_headroom = 0;

	rt2x00dev->hw->queues = 2;



	SET_IEEE80211_DEV(rt2x00dev->hw, &rt2x00dev_pci(rt2x00dev)->dev);

	SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
@@ -1933,6 +1932,7 @@ static const struct rt2x00_ops rt2500pci_ops = { 
	.max_ap_intf	= 1,

	.eeprom_size	= EEPROM_SIZE,

	.rf_size	= RF_SIZE,

	.tx_queues	= NUM_TX_QUEUES,

	.rx		= &rt2500pci_queue_rx,

	.tx		= &rt2500pci_queue_tx,

	.bcn		= &rt2500pci_queue_bcn,

drivers/net/wireless/rt2x00/rt2500pci.h

+5 −0
Original line number Diff line number Diff line
@@ -62,6 +62,11 @@ 
#define BBP_SIZE			0x0040

#define RF_SIZE				0x0014



/*

 * Number of TX queues.

 */

#define NUM_TX_QUEUES			2



/*

 * Control/Status Registers(CSR).

 * Some values are set in TU, whereas 1 TU == 1024 us.

drivers/net/wireless/rt2x00/rt2500usb.c

+1 −1
Original line number Diff line number Diff line
@@ -1590,7 +1590,6 @@ static void rt2500usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev) 
	    IEEE80211_HW_SIGNAL_DBM;



	rt2x00dev->hw->extra_tx_headroom = TXD_DESC_SIZE;

	rt2x00dev->hw->queues = 2;



	SET_IEEE80211_DEV(rt2x00dev->hw, &rt2x00dev_usb(rt2x00dev)->dev);

	SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
@@ -1826,6 +1825,7 @@ static const struct rt2x00_ops rt2500usb_ops = { 
	.max_ap_intf	= 1,

	.eeprom_size	= EEPROM_SIZE,

	.rf_size	= RF_SIZE,

	.tx_queues	= NUM_TX_QUEUES,

	.rx		= &rt2500usb_queue_rx,

	.tx		= &rt2500usb_queue_tx,

	.bcn		= &rt2500usb_queue_bcn,