Re: Fixing rt2500pci [PATCH]

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Peter Chubb
Date: Wednesday, July 30, 2008 - 5:56 pm

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@gelato.unsw.edu.au>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>

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
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Fixing rt2500pci, Peter Chubb, (Tue Jul 29, 10:08 pm)
Re: Fixing rt2500pci, Ivo van Doorn, (Wed Jul 30, 12:05 pm)
Re: Fixing rt2500pci, Ivo van Doorn, (Wed Jul 30, 12:15 pm)
Re: Fixing rt2500pci [PATCH], Peter Chubb, (Wed Jul 30, 5:56 pm)
Re: Fixing rt2500pci [PATCH], Peter Chubb, (Wed Jul 30, 7:11 pm)
Re: Fixing rt2500pci, Peter Chubb, (Wed Jul 30, 9:07 pm)
Re: Fixing rt2500pci [PATCH], Ivo van Doorn, (Thu Jul 31, 12:21 am)
Re: Fixing rt2500pci [PATCH], John Daiker, (Thu Jul 31, 2:51 pm)
Re: Fixing rt2500pci, Peter Chubb, (Mon Aug 4, 8:01 pm)
Re: Fixing rt2500pci, Ivo van Doorn, (Tue Aug 5, 11:44 am)
Re: Fixing rt2500pci, Peter Chubb, (Tue Aug 5, 2:01 pm)
Re: Fixing rt2500pci, Peter Chubb, (Tue Aug 5, 6:10 pm)
Re: Fixing rt2500pci [PATCH], Ivo van Doorn, (Tue Aug 12, 3:01 am)
Re: [stable] Fixing rt2500pci [PATCH], Greg KH, (Sat Aug 16, 4:32 pm)
Re: [stable] Fixing rt2500pci [PATCH], Ivo van Doorn, (Sun Aug 17, 1:58 am)