Return-path: Received: from fk-out-0910.google.com ([209.85.128.189]:48366 "EHLO fk-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751663AbYHLJc6 (ORCPT ); Tue, 12 Aug 2008 05:32:58 -0400 Received: by fk-out-0910.google.com with SMTP id 18so2191397fkq.5 for ; Tue, 12 Aug 2008 02:32:57 -0700 (PDT) To: John Linville Subject: Re: Fixing rt2500pci [PATCH] Date: Tue, 12 Aug 2008 12:01:26 +0200 Cc: Peter Chubb , linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, stable@kernel.org References: <87tze8vu18.wl%peterc@chubb.wattle.id.au> <200807302115.03865.IvDoorn@gmail.com> <87vdym6fct.wl%peterc@chubb.wattle.id.au> In-Reply-To: <87vdym6fct.wl%peterc@chubb.wattle.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Message-Id: <200808121201.26544.IvDoorn@gmail.com> (sfid-20080812_113303_976433_23454143) From: Ivo van Doorn Sender: linux-wireless-owner@vger.kernel.org List-ID: On Thursday 31 July 2008, 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. > > Signed-off-by: Peter Chubb > Acked-by: Ivo van Doorn [stable@kernel.org added to CC] The 2.6.27 version of the patch has already been pushed upstream, this one is for 2.6.26-stable since this fixes a regression introduced after 2.6.25. --- > diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c > index 1724ce9..4ba2165 100644 > --- a/drivers/net/wireless/rt2x00/rt2500pci.c > +++ b/drivers/net/wireless/rt2x00/rt2500pci.c > @@ -1198,6 +1198,7 @@ static void rt2500pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, > 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, skbdesc->data_len); > rt2x00_set_field32(&word, TXD_W0_CIPHER_ALG, CIPHER_NONE); > rt2x00_desc_write(txd, 0, word); > } > > -- > 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 > -- > 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 >