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

Commit 150cc692 authored by Gabor Juhos's avatar Gabor Juhos Committed by John W. Linville
Browse files

rt2x00: rt2800: unify [RT]XWI_SIZE defines 



Use common names instead of chip specific ones.
The patch contains no functional changes, but
it makes it easier to add support for further
descriptor sizes.

Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Acked-by: default avatarStanislaw Gruszka <stf_xl@wp.pl>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a53aff5d

drivers/net/wireless/rt2x00/rt2800.h

+6 −4
Original line number Diff line number Diff line
@@ -2625,11 +2625,13 @@ struct mac_iveiv_entry { 
/*

 * DMA descriptor defines.

 */

#define TXWI_DESC_SIZE			(4 * sizeof(__le32))

#define RXWI_DESC_SIZE			(4 * sizeof(__le32))



#define TXWI_DESC_SIZE_5592		(5 * sizeof(__le32))

#define RXWI_DESC_SIZE_5592		(6 * sizeof(__le32))

#define TXWI_DESC_SIZE_4WORDS		(4 * sizeof(__le32))

#define TXWI_DESC_SIZE_5WORDS		(5 * sizeof(__le32))



#define RXWI_DESC_SIZE_4WORDS		(4 * sizeof(__le32))

#define RXWI_DESC_SIZE_6WORDS		(6 * sizeof(__le32))



/*

 * TX WI structure

 */

drivers/net/wireless/rt2x00/rt2800pci.c

+3 −3
Original line number Diff line number Diff line
@@ -1194,7 +1194,7 @@ static void rt2800pci_queue_init(struct data_queue *queue) 
		queue->limit = 128;

		queue->data_size = AGGREGATION_SIZE;

		queue->desc_size = RXD_DESC_SIZE;

		queue->winfo_size = RXWI_DESC_SIZE;

		queue->winfo_size = RXWI_DESC_SIZE_4WORDS;

		queue->priv_size = sizeof(struct queue_entry_priv_mmio);

		break;
@@ -1205,7 +1205,7 @@ static void rt2800pci_queue_init(struct data_queue *queue) 
		queue->limit = 64;

		queue->data_size = AGGREGATION_SIZE;

		queue->desc_size = TXD_DESC_SIZE;

		queue->winfo_size = TXWI_DESC_SIZE;

		queue->winfo_size = TXWI_DESC_SIZE_4WORDS;

		queue->priv_size = sizeof(struct queue_entry_priv_mmio);

		break;
@@ -1213,7 +1213,7 @@ static void rt2800pci_queue_init(struct data_queue *queue) 
		queue->limit = 8;

		queue->data_size = 0; /* No DMA required for beacons */

		queue->desc_size = TXD_DESC_SIZE;

		queue->winfo_size = TXWI_DESC_SIZE;

		queue->winfo_size = TXWI_DESC_SIZE_4WORDS;

		queue->priv_size = sizeof(struct queue_entry_priv_mmio);

		break;

drivers/net/wireless/rt2x00/rt2800usb.c

+4 −4
Original line number Diff line number Diff line
@@ -855,11 +855,11 @@ static void rt2800usb_queue_init(struct data_queue *queue) 
	unsigned short txwi_size, rxwi_size;



	if (rt2x00_rt(rt2x00dev, RT5592)) {

		txwi_size = TXWI_DESC_SIZE_5592;

		rxwi_size = RXWI_DESC_SIZE_5592;

		txwi_size = TXWI_DESC_SIZE_5WORDS;

		rxwi_size = RXWI_DESC_SIZE_6WORDS;

	} else {

		txwi_size = TXWI_DESC_SIZE;

		rxwi_size = RXWI_DESC_SIZE;

		txwi_size = TXWI_DESC_SIZE_4WORDS;

		rxwi_size = RXWI_DESC_SIZE_4WORDS;

	}



	switch (queue->qid) {