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

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

rt2x00: conf_tx() only need register access for WMM queues 



conf_tx() in rt61pci and rt73usb only have to check once
if the queue_idx indicates a non-WMM queue and break of
the function immediately if that is the case.

Only the WMM queues need to have the TX configuration written
to the registers.

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

drivers/net/wireless/rt2x00/rt61pci.c

+15 −15
Original line number Diff line number Diff line
@@ -2657,6 +2657,7 @@ static int rt61pci_conf_tx(struct ieee80211_hw *hw, u16 queue_idx, 
	struct rt2x00_field32 field;

	int retval;

	u32 reg;

	u32 offset;



	/*

	 * First pass the configuration through rt2x00lib, that will
@@ -2668,24 +2669,23 @@ static int rt61pci_conf_tx(struct ieee80211_hw *hw, u16 queue_idx, 
	if (retval)

		return retval;



	/*

	 * We only need to perform additional register initialization

	 * for WMM queues/

	 */

	if (queue_idx >= 4)

		return 0;



	queue = rt2x00queue_get_queue(rt2x00dev, queue_idx);



	/* Update WMM TXOP register */

	if (queue_idx < 2) {

		field.bit_offset = queue_idx * 16;

	offset = AC_TXOP_CSR0 + (sizeof(u32) * (!!(queue_idx & 2)));

	field.bit_offset = (queue_idx & 1) * 16;

	field.bit_mask = 0xffff << field.bit_offset;



		rt2x00pci_register_read(rt2x00dev, AC_TXOP_CSR0, &reg);

	rt2x00pci_register_read(rt2x00dev, offset, &reg);

	rt2x00_set_field32(&reg, field, queue->txop);

		rt2x00pci_register_write(rt2x00dev, AC_TXOP_CSR0, reg);

	} else if (queue_idx < 4) {

		field.bit_offset = (queue_idx - 2) * 16;

		field.bit_mask = 0xffff << field.bit_offset;



		rt2x00pci_register_read(rt2x00dev, AC_TXOP_CSR1, &reg);

		rt2x00_set_field32(&reg, field, queue->txop);

		rt2x00pci_register_write(rt2x00dev, AC_TXOP_CSR1, reg);

	}

	rt2x00pci_register_write(rt2x00dev, offset, reg);



	/* Update WMM registers */

	field.bit_offset = queue_idx * 4;

drivers/net/wireless/rt2x00/rt73usb.c

+15 −15
Original line number Diff line number Diff line
@@ -2180,6 +2180,7 @@ static int rt73usb_conf_tx(struct ieee80211_hw *hw, u16 queue_idx, 
	struct rt2x00_field32 field;

	int retval;

	u32 reg;

	u32 offset;



	/*

	 * First pass the configuration through rt2x00lib, that will
@@ -2191,24 +2192,23 @@ static int rt73usb_conf_tx(struct ieee80211_hw *hw, u16 queue_idx, 
	if (retval)

		return retval;



	/*

	 * We only need to perform additional register initialization

	 * for WMM queues/

	 */

	if (queue_idx >= 4)

		return 0;



	queue = rt2x00queue_get_queue(rt2x00dev, queue_idx);



	/* Update WMM TXOP register */

	if (queue_idx < 2) {

		field.bit_offset = queue_idx * 16;

	offset = AC_TXOP_CSR0 + (sizeof(u32) * (!!(queue_idx & 2)));

	field.bit_offset = (queue_idx & 1) * 16;

	field.bit_mask = 0xffff << field.bit_offset;



		rt2x00usb_register_read(rt2x00dev, AC_TXOP_CSR0, &reg);

	rt2x00usb_register_read(rt2x00dev, offset, &reg);

	rt2x00_set_field32(&reg, field, queue->txop);

		rt2x00usb_register_write(rt2x00dev, AC_TXOP_CSR0, reg);

	} else if (queue_idx < 4) {

		field.bit_offset = (queue_idx - 2) * 16;

		field.bit_mask = 0xffff << field.bit_offset;



		rt2x00usb_register_read(rt2x00dev, AC_TXOP_CSR1, &reg);

		rt2x00_set_field32(&reg, field, queue->txop);

		rt2x00usb_register_write(rt2x00dev, AC_TXOP_CSR1, reg);

	}

	rt2x00usb_register_write(rt2x00dev, offset, reg);



	/* Update WMM registers */

	field.bit_offset = queue_idx * 4;