[rt2x00-users] [PATCH 1/2] rt2x00: Rename txentry_desc.queue -> txentry_desc.qid

[Helmut Schaa]

Am Monday 30 August 2010 schrieb Ivo Van Doorn:
> On Mon, Aug 30, 2010 at 3:38 PM, Ivo Van Doorn <ivdoorn at gmail.com> wrote:
> > On Mon, Aug 30, 2010 at 3:05 PM, Helmut Schaa
> > <helmut.schaa at googlemail.com> wrote:
> >> 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 at googlemail.com>
> >
> > Applied to rt2x00.git
> 
> And reverted again.
> 
> It doesn't seem to compile since you forgot to update the other drivers.
> I'll respin the patch to include the other drivers as well.

Ah, sorry bout that, I've only built rt2800 :(

> 
> >> ---
> >>  drivers/net/wireless/rt2x00/rt2800lib.c   |    2 +-
> >>  drivers/net/wireless/rt2x00/rt2x00queue.c |    2 +-
> >>  drivers/net/wireless/rt2x00/rt2x00queue.h |    2 +-
> >>  3 files changed, 3 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
> >> index 2fd326c..ac92e7c 100644
> >> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
> >> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
> >> @@ -469,7 +469,7 @@ void rt2800_write_tx_data(struct queue_entry *entry,
> >>                           txdesc->key_idx : 0xff);
> >>        rt2x00_set_field32(&word, TXWI_W1_MPDU_TOTAL_BYTE_COUNT,
> >>                           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);
> >>
> >>        /*
> >> diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
> >> index a2bd176..7b25d66 100644
> >> --- a/drivers/net/wireless/rt2x00/rt2x00queue.c
> >> +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
> >> @@ -312,7 +312,7 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry,
> >>        /*
> >>         * Initialize information from queue
> >>         */
> >> -       txdesc->queue = entry->queue->qid;
> >> +       txdesc->qid = entry->queue->qid;
> >>        txdesc->cw_min = entry->queue->cw_min;
> >>        txdesc->cw_max = entry->queue->cw_max;
> >>        txdesc->aifs = entry->queue->aifs;
> >> diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h
> >> index c451a50..a00fd23 100644
> >> --- a/drivers/net/wireless/rt2x00/rt2x00queue.h
> >> +++ b/drivers/net/wireless/rt2x00/rt2x00queue.h
> >> @@ -322,7 +322,7 @@ enum txentry_desc_flags {
> >>  struct txentry_desc {
> >>        unsigned long flags;
> >>
> >> -       enum data_queue_qid queue;
> >> +       enum data_queue_qid qid;
> >>
> >>        u16 length;
> >>        u16 header_length;
> >> --
> >> 1.7.1
> >>
> >>
> >
>