[Bug 2905] New: Aironet 340 PCMCIA card not working since 2.6.7

[Bug 2905] New: Aironet 340 PCMCIA card not working since 2.6.7

[bugme-daemon]

http://bugme.osdl.org/show_bug.cgi?id=2905

           Summary: Aironet 340 PCMCIA card not working since 2.6.7
    Kernel Version: 2.6.7
            Status: NEW
          Severity: normal
             Owner: rmk@arm.linux.org.uk
         Submitter: hadmut@danisch.de


Distribution: Debian
Hardware Environment: Dell Inspiron 3800, Cisco
  Aironet 340 PCMCIA card
Software Environment:
  Debian
Problem Description:

The system was working well with 
2.4.x and 2.6.x kernels up to 2.6.6.

After upgrade to 2.6.7 the WLAN does n
not work anymore: There is no error message, 
no warning, everything looks fine, except
for the fact that traffic is not possible.

Maybe a WEP problem?

regards
Hadmut

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.

Re: [Bug 2905] New: Aironet 340 PCMCIA card not working since 2.6.7

[Guennadi Liakhovetski]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1477 bytes --]

Don't think it will help for this specific problem, but this patch fixes 
alignment problem (especially seen on ARM, Russell:-)). Sending as a text 
attachment, as my setup is known to mangle tabs...

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>

Thanks
Guennadi

On Thu, 17 Jun 2004 bugme-daemon@osdl.org wrote:

> http://bugme.osdl.org/show_bug.cgi?id=2905
>
>           Summary: Aironet 340 PCMCIA card not working since 2.6.7
>    Kernel Version: 2.6.7
>            Status: NEW
>          Severity: normal
>             Owner: rmk@arm.linux.org.uk
>         Submitter: hadmut@danisch.de
>
>
> Distribution: Debian
> Hardware Environment: Dell Inspiron 3800, Cisco
>  Aironet 340 PCMCIA card
> Software Environment:
>  Debian
> Problem Description:
>
> The system was working well with
> 2.4.x and 2.6.x kernels up to 2.6.6.
>
> After upgrade to 2.6.7 the WLAN does n
> not work anymore: There is no error message,
> no warning, everything looks fine, except
> for the fact that traffic is not possible.
>
> Maybe a WEP problem?
>
> regards
> Hadmut
>
> ------- You are receiving this mail because: -------
> You are the assignee for the bug, or are watching the assignee.
> -
> 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/
>
>

---
Guennadi Liakhovetski

[-- Attachment #2: Type: TEXT/PLAIN, Size: 609 bytes --]

diff -u a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
--- a/drivers/net/wireless/airo.c	19 May 2004 16:06:36
+++ b/drivers/net/wireless/airo.c	17 Jun 2004 19:50:56
@@ -3151,11 +3151,12 @@
 			} else
 				hdrlen = ETH_ALEN * 2;
 
-			skb = dev_alloc_skb( len + hdrlen + 2 );
+			skb = dev_alloc_skb( len + hdrlen + 2 + 2 );
 			if ( !skb ) {
 				apriv->stats.rx_dropped++;
 				goto badrx;
 			}
+			skb_reserve(skb, 2); /* This way the IP header is aligned */
 			buffer = (u16*)skb_put (skb, len + hdrlen);
 			if (test_bit(FLAG_802_11, &apriv->flags)) {
 				buffer[0] = fc;

Re: [Bug 2905] New: Aironet 340 PCMCIA card not working since 2.6.7

[Jesper Juhl]

> -			skb = dev_alloc_skb( len + hdrlen + 2 );
> +			skb = dev_alloc_skb( len + hdrlen + 2 + 2 );

nitpicking, but why not
	skb = dev_alloc_skb( len + hdrlen + 4 );
?


--
Jesper Juhl <juhl-lkml@dif.dk>

Re: [Bug 2905] New: Aironet 340 PCMCIA card not working since 2.6.7

[Horst von Brand]

Jesper Juhl <juhl-lkml@dif.dk> said:
> Guennadi Liakhovetski <g.liakhovetski@gmx.de> said:
> > -			skb = dev_alloc_skb( len + hdrlen + 2 );
> > +			skb = dev_alloc_skb( len + hdrlen + 2 + 2 );
> 
> nitpicking, but why not
> 	skb = dev_alloc_skb( len + hdrlen + 4 );
> ?

- It makes no difference (C forces constant expresions to be computed at
  compile time)
- It _does_ matter if the 2 + 2 is clearer than 4
-- 
Dr. Horst H. von Brand                   User #22616 counter.li.org
Departamento de Informatica                     Fono: +56 32 654431
Universidad Tecnica Federico Santa Maria              +56 32 654239
Casilla 110-V, Valparaiso, Chile                Fax:  +56 32 797513

Re: [Bug 2905] New: Aironet 340 PCMCIA card not working since 2.6.7

[Guennadi Liakhovetski]

On Fri, 18 Jun 2004, Jesper Juhl wrote:

>
>> -			skb = dev_alloc_skb( len + hdrlen + 2 );
>> +			skb = dev_alloc_skb( len + hdrlen + 2 + 2 );
>
> nitpicking, but why not
> 	skb = dev_alloc_skb( len + hdrlen + 4 );
> ?

Well, I just didn't have my pocket calculator at hand at that moment, so, 
I decided to let the compiler compute it for me:-) It's just short for

#define SKB_ALIGN 2
 	skb = dev_alloc_skb( len + hdrlen + 2 + SKB_ALIGN );
 	skb_reserve(skb, SKB_ALIGN);

Guennadi
---
Guennadi Liakhovetski

Re: [Bug 2905] New: Aironet 340 PCMCIA card not working since 2.6.7

[Russell King]

On Thu, Jun 17, 2004 at 09:58:32PM +0200, Guennadi Liakhovetski wrote:
> Don't think it will help for this specific problem, but this patch fixes 
> alignment problem (especially seen on ARM, Russell:-)). Sending as a text 
> attachment, as my setup is known to mangle tabs...
> 
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>

Can you forward this to Jeff Garzik please?

Thanks.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 PCMCIA      - http://pcmcia.arm.linux.org.uk/
                 2.6 Serial core

Re: [Bug 2905] New: Aironet 340 PCMCIA card not working since 2.6.7

[Guennadi Liakhovetski]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 722 bytes --]

On Wed, 23 Jun 2004, Russell King wrote:

> On Thu, Jun 17, 2004 at 09:58:32PM +0200, Guennadi Liakhovetski wrote:
>> Don't think it will help for this specific problem, but this patch fixes
>> alignment problem (especially seen on ARM, Russell:-)). Sending as a text
>> attachment, as my setup is known to mangle tabs...
>>
>> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
>
> Can you forward this to Jeff Garzik please?

Jeff, please, apply to 2.6. It should also go into 2.4, it is quite 
trivial and is actually a bugfix. Don't know if it will aply to 
2.4, if not, and if you prefer me to do it rather than do it yourself, I 
could rediff it against 2.4 too.

Thanks
Guennadi
---
Guennadi Liakhovetski

[-- Attachment #2: Type: TEXT/PLAIN, Size: 609 bytes --]

diff -u a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
--- a/drivers/net/wireless/airo.c	19 May 2004 16:06:36
+++ b/drivers/net/wireless/airo.c	17 Jun 2004 19:50:56
@@ -3151,11 +3151,12 @@
 			} else
 				hdrlen = ETH_ALEN * 2;
 
-			skb = dev_alloc_skb( len + hdrlen + 2 );
+			skb = dev_alloc_skb( len + hdrlen + 2 + 2 );
 			if ( !skb ) {
 				apriv->stats.rx_dropped++;
 				goto badrx;
 			}
+			skb_reserve(skb, 2); /* This way the IP header is aligned */
 			buffer = (u16*)skb_put (skb, len + hdrlen);
 			if (test_bit(FLAG_802_11, &apriv->flags)) {
 				buffer[0] = fc;

Re: [Bug 2905] New: Aironet 340 PCMCIA card not working since 2.6.7

[Guennadi Liakhovetski]

On Wed, 23 Jun 2004, Guennadi Liakhovetski wrote:

> On Wed, 23 Jun 2004, Russell King wrote:
>
>> On Thu, Jun 17, 2004 at 09:58:32PM +0200, Guennadi Liakhovetski wrote:
>>> Don't think it will help for this specific problem, but this patch fixes
>>> alignment problem (especially seen on ARM, Russell:-)). Sending as a 
>>> text attachment, as my setup is known to mangle tabs...
>>> 
>>> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
>> 
>> Can you forward this to Jeff Garzik please?
>
> Jeff, please, apply to 2.6. It should also go into 2.4, it is quite trivial 
> and is actually a bugfix. Don't know if it will aply to 2.4, if not, and if 
> you prefer me to do it rather than do it yourself, I could rediff it against 
> 2.4 too.

Jeff

It's not yet in 2.6.7, didn't see it in  2.6.8-rc1 announcement either, 
didn't check the code though. Have I missed it, or is it still not 
applied? Are you considering applying it to a later version?

Thanks
Guennadi
---
Guennadi Liakhovetski

Re: [Bug 2905] New: Aironet 340 PCMCIA card not working since 2.6.7

[Jeff Garzik]

applied

Re: [Bug 2905] New: Aironet 340 PCMCIA card not working since 2.6.7

[Guennadi Liakhovetski]

On Wed, 14 Jul 2004, Jeff Garzik wrote:

> applied

Thanks. To 2.6 only or to 2.4 too? Or shall I send a separate patch for 
2.4?

Guennadi
---
Guennadi Liakhovetski

Re: [Bug 2905] New: Aironet 340 PCMCIA card not working since 2.6.7

[Jeff Garzik]

Guennadi Liakhovetski wrote:
> On Wed, 14 Jul 2004, Jeff Garzik wrote:
> 
>> applied
> 
> 
> Thanks. To 2.6 only or to 2.4 too? Or shall I send a separate patch for 
> 2.4?


Please send a separate patch for 2.4.x.

Also, please note your patch was base64-encoded, and thus broke my 
patch-apply scripts.

	Jeff