2005-03-28 09:49:21

by Colin Leroy

[permalink] [raw]
Subject: [PATCH] fix shared key auth in zd1201

Hi,

this is a resend of a patch that Andrew put in -mm, but that I think is
ok and should go into mainline. I did not get any feedback (positive or
negative) about it. Please either apply it or explain why not...

It's currently impossible to associate with a shared-key-only access
point using the zd1201 driver. The attached patch fixes it. The reason
was (probably) a typo in the definitions of the authentification types.
I found that they should be (1,2) instead of (0,1) by looking at the
old linux-wlan-ng driver by Zydas.

Signed-off-by: Colin Leroy <[email protected]>
--- a/drivers/usb/net/zd1201.h 2005-03-25 09:14:49.000000000 +0100
+++ b/drivers/usb/net/zd1201.h 2005-03-25 09:11:59.000000000 +0100
@@ -141,7 +141,7 @@
#define ZD1201_RATEB5 4 /* 5.5 really, but 5 is shorter :) */
#define ZD1201_RATEB11 8

-#define ZD1201_CNFAUTHENTICATION_OPENSYSTEM 0
-#define ZD1201_CNFAUTHENTICATION_SHAREDKEY 1
+#define ZD1201_CNFAUTHENTICATION_OPENSYSTEM 0x0001
+#define ZD1201_CNFAUTHENTICATION_SHAREDKEY 0x0002

#endif /* _INCLUDE_ZD1201_H_ */


2005-03-28 10:04:57

by Jesper Juhl

[permalink] [raw]
Subject: Re: [PATCH] fix shared key auth in zd1201

On Mon, 28 Mar 2005, Colin Leroy wrote:

> Hi,
>
> this is a resend of a patch that Andrew put in -mm, but that I think is
> ok and should go into mainline. I did not get any feedback (positive or
> negative) about it. Please either apply it or explain why not...
>
> It's currently impossible to associate with a shared-key-only access
> point using the zd1201 driver. The attached patch fixes it. The reason
[snip]

If Andrew merged it in -mm, then it's on the right track for mainline I'd
say. Andrew seems to be quite good at keeping the experimental/needs
testing stuff in -mm for a while to shake out the bugs, but at the same
time let the rest migrate onwards to Linus fairly quickly...
If it's currently in -mm I'd just relax and wait for it to hit mainline in
2.6.12 or 2.6.13...


--
Jesper Juhl

2005-03-28 20:50:01

by Greg KH

[permalink] [raw]
Subject: Re: [PATCH] fix shared key auth in zd1201

On Mon, Mar 28, 2005 at 11:49:04AM +0200, Colin Leroy wrote:
> Hi,
>
> this is a resend of a patch that Andrew put in -mm, but that I think is
> ok and should go into mainline. I did not get any feedback (positive or
> negative) about it. Please either apply it or explain why not...
>
> It's currently impossible to associate with a shared-key-only access
> point using the zd1201 driver. The attached patch fixes it. The reason
> was (probably) a typo in the definitions of the authentification types.
> I found that they should be (1,2) instead of (0,1) by looking at the
> old linux-wlan-ng driver by Zydas.

Applied, thanks.

greg k-h