iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rt2x00: Rename txentry_desc.queue -> txentry_desc.qid

Browse Source 
Variables containing queue ids are called qid everywhere else, hence
rename the queue field in txentry_desc to qid as well.

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Helmut Schaa 2010-08-30 21:12:24 +02:00 committed by John W. Linville
parent 56363ddeee
commit a908a74382
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/rt2x00/rt2800lib.c
View File

@ -469,7 +469,7 @@ void rt2800_write_tx_data(struct queue_entry *entry,
txdesc->key_idx : 0xff); txdesc->key_idx : 0xff);
rt2x00_set_field32(&word, TXWI_W1_MPDU_TOTAL_BYTE_COUNT, rt2x00_set_field32(&word, TXWI_W1_MPDU_TOTAL_BYTE_COUNT,
txdesc->length); txdesc->length);
rt2x00_set_field32(&word, TXWI_W1_PACKETID, txdesc->queue + 1); rt2x00_set_field32(&word, TXWI_W1_PACKETID, txdesc->qid + 1);
rt2x00_desc_write(txwi, 1, word); rt2x00_desc_write(txwi, 1, word);
/* /*

2
drivers/net/wireless/rt2x00/rt2x00queue.c
View File

@ -312,7 +312,7 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry,
/* /*
* Initialize information from queue * Initialize information from queue
*/ */
txdesc->queue = entry->queue->qid; txdesc->qid = entry->queue->qid;
txdesc->cw_min = entry->queue->cw_min; txdesc->cw_min = entry->queue->cw_min;
txdesc->cw_max = entry->queue->cw_max; txdesc->cw_max = entry->queue->cw_max;
txdesc->aifs = entry->queue->aifs; txdesc->aifs = entry->queue->aifs;

4
drivers/net/wireless/rt2x00/rt2x00queue.h
View File

@ -296,7 +296,7 @@ enum txentry_desc_flags {
* Summary of information for the frame descriptor before sending a TX frame. * Summary of information for the frame descriptor before sending a TX frame.
* *
* @flags: Descriptor flags (See &enum queue_entry_flags). * @flags: Descriptor flags (See &enum queue_entry_flags).
* @queue: Queue identification (See &enum data_queue_qid). * @qid: Queue identification (See &enum data_queue_qid).
* @length: Length of the entire frame. * @length: Length of the entire frame.
* @header_length: Length of 802.11 header. * @header_length: Length of 802.11 header.
* @length_high: PLCP length high word. * @length_high: PLCP length high word.
@ -322,7 +322,7 @@ enum txentry_desc_flags {
struct txentry_desc { struct txentry_desc {
unsigned long flags; unsigned long flags;
enum data_queue_qid queue; enum data_queue_qid qid;
u16 length; u16 length;
u16 header_length; u16 header_length;

6
drivers/net/wireless/rt2x00/rt61pci.c
View File

@ -1778,7 +1778,7 @@ static void rt61pci_write_tx_desc(struct queue_entry *entry,
* Start writing the descriptor words. * Start writing the descriptor words.
*/ */
rt2x00_desc_read(txd, 1, &word); rt2x00_desc_read(txd, 1, &word);
rt2x00_set_field32(&word, TXD_W1_HOST_Q_ID, txdesc->queue); rt2x00_set_field32(&word, TXD_W1_HOST_Q_ID, txdesc->qid);
rt2x00_set_field32(&word, TXD_W1_AIFSN, txdesc->aifs); rt2x00_set_field32(&word, TXD_W1_AIFSN, txdesc->aifs);
rt2x00_set_field32(&word, TXD_W1_CWMIN, txdesc->cw_min); rt2x00_set_field32(&word, TXD_W1_CWMIN, txdesc->cw_min);
rt2x00_set_field32(&word, TXD_W1_CWMAX, txdesc->cw_max); rt2x00_set_field32(&word, TXD_W1_CWMAX, txdesc->cw_max);
@ -1809,7 +1809,7 @@ static void rt61pci_write_tx_desc(struct queue_entry *entry,
rt2x00_set_field32(&word, TXD_W5_WAITING_DMA_DONE_INT, 1); rt2x00_set_field32(&word, TXD_W5_WAITING_DMA_DONE_INT, 1);
rt2x00_desc_write(txd, 5, word); rt2x00_desc_write(txd, 5, word);
if (txdesc->queue != QID_BEACON) { if (txdesc->qid != QID_BEACON) {
rt2x00_desc_read(txd, 6, &word); rt2x00_desc_read(txd, 6, &word);
rt2x00_set_field32(&word, TXD_W6_BUFFER_PHYSICAL_ADDRESS, rt2x00_set_field32(&word, TXD_W6_BUFFER_PHYSICAL_ADDRESS,
skbdesc->skb_dma); skbdesc->skb_dma);
@ -1856,7 +1856,7 @@ static void rt61pci_write_tx_desc(struct queue_entry *entry,
*/ */
skbdesc->desc = txd; skbdesc->desc = txd;
skbdesc->desc_len = skbdesc->desc_len =
(txdesc->queue == QID_BEACON) ? TXINFO_SIZE : TXD_DESC_SIZE; (txdesc->qid == QID_BEACON) ? TXINFO_SIZE : TXD_DESC_SIZE;
} }
/* /*

2
drivers/net/wireless/rt2x00/rt73usb.c
View File

@ -1463,7 +1463,7 @@ static void rt73usb_write_tx_desc(struct queue_entry *entry,
rt2x00_desc_write(txd, 0, word); rt2x00_desc_write(txd, 0, word);
rt2x00_desc_read(txd, 1, &word); rt2x00_desc_read(txd, 1, &word);
rt2x00_set_field32(&word, TXD_W1_HOST_Q_ID, txdesc->queue); rt2x00_set_field32(&word, TXD_W1_HOST_Q_ID, txdesc->qid);
rt2x00_set_field32(&word, TXD_W1_AIFSN, txdesc->aifs); rt2x00_set_field32(&word, TXD_W1_AIFSN, txdesc->aifs);
rt2x00_set_field32(&word, TXD_W1_CWMIN, txdesc->cw_min); rt2x00_set_field32(&word, TXD_W1_CWMIN, txdesc->cw_min);
rt2x00_set_field32(&word, TXD_W1_CWMAX, txdesc->cw_max); rt2x00_set_field32(&word, TXD_W1_CWMAX, txdesc->cw_max);