Re: rt61pci: WEP broken in current wireless-testing

[Gertjan van Wingerde <gwingerde@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 705 bytes --]

On 05/07/10 03:14, Pavel Roskin wrote:
> Quoting "John W. Linville" <linville@tuxdriver.com>:
> 
>> When you get to this, you probably should use wireless-next-2.6
>> (or wireless-2.6) for the bisection.  The pulls from linux-2.6 in
>> wireless-testing make bisection much more painful than necessary
>> (as long as the problem is actually evident in the other kernels).
> 
> I know it's painful!
> 
>> You can use the 'master-<date>' tags as guidelines for matching
>> wireless-testing versions to representative wireless-next-2.6 (or
>> wireless-2.6) tree versions.
> 
> Thank you for the tips!
> 

Hi,

It might be that one of my recent patches broke this. Can you try the
attached patch?

---
Gertjan

[-- Attachment #2: rt61pci-wep-fix.diff --]
[-- Type: text/plain, Size: 529 bytes --]

diff --git a/drivers/net/wireless/rt2x00/rt2x00crypto.c b/drivers/net/wireless/rt2x00/rt2x00crypto.c
index d291c78..583dacd 100644
--- a/drivers/net/wireless/rt2x00/rt2x00crypto.c
+++ b/drivers/net/wireless/rt2x00/rt2x00crypto.c
@@ -128,6 +128,7 @@ void rt2x00crypto_tx_remove_iv(struct sk_buff *skb, struct txentry_desc *txdesc)
 
 	/* Pull buffer to correct size */
 	skb_pull(skb, txdesc->iv_len);
+	txdesc->length -= txdesc->iv_len;
 
 	/* IV/EIV data has officially been stripped */
 	skbdesc->flags |= SKBDESC_IV_STRIPPED;