From: John Daiker <daikerjohn@gmail.com>
To: Peter Chubb <peterc@chubb.wattle.id.au>
Cc: Peter Chubb <peterc@gelato.unsw.edu.au>,
Ivo van Doorn <ivdoorn@gmail.com>,
linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org,
John Linville <linville@tuxdriver.com>
Subject: Re: Fixing rt2500pci [PATCH]
Date: Thu, 31 Jul 2008 14:51:29 -0700 [thread overview]
Message-ID: <489233E1.8080800@gmail.com> (raw)
In-Reply-To: <87wsj2246r.wl%peterc@chubb.wattle.id.au>
Peter Chubb wrote:
> In kernel version 2.6.26-rc9 my wireless LAN card worked; but in the
> released 2.6.26, my RaLink rt2500 card wouldn't associate.
>
> Git-bisect led me to this patch:
>
> 61486e0f68d1f8966c09b734566a187d42d65c54
> rt2x00: Remove ieee80211_tx_control argument from write_tx_desc()
>
> I believe that there is a problem with that patch --- it
> (inadvertantly) removes an extra line of code, that used to set the
> DATABYTE_COUNT field.
>
> This patch reinstates that line, and with it my card works again.
>
> The original version I sent still used the skbdesc->data_len which has
> been removed; this version of the patch applies on top of 2.6.27-rc1.
>
> Signed-off-by: Peter Chubb <peterc@gelato.unsw.edu.au>
> Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
>
>
> Index: linux-2.6-git/drivers/net/wireless/rt2x00/rt2500pci.c
> ===================================================================
> --- linux-2.6-git.orig/drivers/net/wireless/rt2x00/rt2500pci.c 2008-07-31 10:58:43.000000000 +1000
> +++ linux-2.6-git/drivers/net/wireless/rt2x00/rt2500pci.c 2008-07-31 11:40:44.000000000 +1000
> @@ -1213,20 +1213,21 @@ static void rt2500pci_write_tx_desc(stru
> rt2x00_set_field32(&word, TXD_W0_ACK,
> test_bit(ENTRY_TXD_ACK, &txdesc->flags));
> rt2x00_set_field32(&word, TXD_W0_TIMESTAMP,
> test_bit(ENTRY_TXD_REQ_TIMESTAMP, &txdesc->flags));
> rt2x00_set_field32(&word, TXD_W0_OFDM,
> test_bit(ENTRY_TXD_OFDM_RATE, &txdesc->flags));
> rt2x00_set_field32(&word, TXD_W0_CIPHER_OWNER, 1);
> rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->ifs);
> rt2x00_set_field32(&word, TXD_W0_RETRY_MODE,
> test_bit(ENTRY_TXD_RETRY_MODE, &txdesc->flags));
> + rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, skb->len);
> rt2x00_set_field32(&word, TXD_W0_CIPHER_ALG, CIPHER_NONE);
> rt2x00_desc_write(txd, 0, word);
> }
>
> /*
> * TX data initialization
> */
> static void rt2500pci_write_beacon(struct queue_entry *entry)
> {
> struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
>
> --
> Dr Peter Chubb http://www.gelato.unsw.edu.au peterc AT gelato.unsw.edu.au
> http://www.ertos.nicta.com.au ERTOS within National ICT Australia
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
I can confirm that this is working on top of
2.6.27-rc1-94ad374a0751f40d25e22e036c37f7263569d24c
Acked-by: John Daiker <daikerjohn@gmail.com>
next prev parent reply other threads:[~2008-07-31 21:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-30 5:08 Fixing rt2500pci Peter Chubb
2008-07-30 19:05 ` Ivo van Doorn
2008-07-30 19:15 ` Ivo van Doorn
2008-07-31 0:56 ` Fixing rt2500pci [PATCH] Peter Chubb
2008-07-31 2:11 ` Peter Chubb
2008-07-31 21:51 ` John Daiker [this message]
2008-07-31 7:21 ` Ivo van Doorn
2008-08-12 10:01 ` Ivo van Doorn
2008-08-16 23:32 ` [stable] " Greg KH
2008-08-17 8:58 ` Ivo van Doorn
2008-07-31 4:07 ` Fixing rt2500pci Peter Chubb
2008-08-05 3:01 ` Peter Chubb
2008-08-05 18:44 ` Ivo van Doorn
2008-08-05 21:01 ` Peter Chubb
2008-08-06 1:10 ` Peter Chubb
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=489233E1.8080800@gmail.com \
--to=daikerjohn@gmail.com \
--cc=ivdoorn@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=peterc@chubb.wattle.id.au \
--cc=peterc@gelato.unsw.edu.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).