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 <peterc@xxxxxxxxxxxxxxxxxx> > Acked-by: Ivo van Doorn <IvDoorn@xxxxxxxxx> [stable@xxxxxxxxxx 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 > -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
