[PATCH] prism54: correct assignment of DOT1XENABLE in WE-19 codepaths

[PATCH] prism54: correct assignment of DOT1XENABLE in WE-19 codepaths

[Dan Williams]

Correct assignment of DOT1XENABLE in WE-19 codepaths.
RX_UNENCRYPTED_EAPOL = 1 really means setting DOT1XENABLE _off_, and
vice versa.  The original WE-19 patch erroneously reversed that.  This
patch fixes association with unencrypted and WEP networks when using
wpa_supplicant.

It also adds two missing break statements that, left out, could result
in incorrect card configuration.

Please commit to both development and stable branches.

Signed-off-by: Dan Williams <dcbw@redhat.com>

diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 838d510..a5396c1 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -1395,11 +1395,16 @@ static int prism54_set_auth(struct net_device *ndev,
 		break;
 
 	case IW_AUTH_RX_UNENCRYPTED_EAPOL:
-		dot1x = param->value ? 1 : 0;
+		/* dot1x should be the opposite of RX_UNENCRYPTED_EAPOL;
+		 * turn off dot1x when allowing receipt of unencrypted EAPOL
+		 * frames, turn on dot1x when receipt should be disallowed
+		 */
+		dot1x = param->value ? 0 : 0x01;
 		break;
 
 	case IW_AUTH_PRIVACY_INVOKED:
 		privinvoked = param->value ? 1 : 0;
+		break;
 
 	case IW_AUTH_DROP_UNENCRYPTED:
 		exunencrypt = param->value ? 1 : 0;
@@ -1589,6 +1594,7 @@ static int prism54_set_encodeext(struct net_device *ndev,
 			}
 			key.type = DOT11_PRIV_TKIP;
 			key.length = KEY_SIZE_TKIP;
+			break;
 		default:
 			return -EINVAL;
 		}

Re: [PATCH] prism54: correct assignment of DOT1XENABLE in WE-19 codepaths

[Johannes Berg]

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

On Tue, 2007-02-13 at 14:00 -0500, Dan Williams wrote:
> Correct assignment of DOT1XENABLE in WE-19 codepaths.
> RX_UNENCRYPTED_EAPOL = 1 really means setting DOT1XENABLE _off_, and
> vice versa.  The original WE-19 patch erroneously reversed that.  This
> patch fixes association with unencrypted and WEP networks when using
> wpa_supplicant.
> 
> It also adds two missing break statements that, left out, could result
> in incorrect card configuration.
> 
> Please commit to both development and stable branches.

I guess it could also be applicable for stable?

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 190 bytes --]

Re: [PATCH] prism54: correct assignment of DOT1XENABLE in WE-19 codepaths

[Dan Williams]

On Tue, 2007-02-13 at 20:02 +0100, Johannes Berg wrote:
> On Tue, 2007-02-13 at 14:00 -0500, Dan Williams wrote:
> > Correct assignment of DOT1XENABLE in WE-19 codepaths.
> > RX_UNENCRYPTED_EAPOL = 1 really means setting DOT1XENABLE _off_, and
> > vice versa.  The original WE-19 patch erroneously reversed that.  This
> > patch fixes association with unencrypted and WEP networks when using
> > wpa_supplicant.
> > 
> > It also adds two missing break statements that, left out, could result
> > in incorrect card configuration.
> > 
> > Please commit to both development and stable branches.

                                          ^^^^^

Right; applicable to anything after _and_ including 2.6.19, which is
when I think the WE-19 patch landed.

Dan

> 
> I guess it could also be applicable for stable?
> 
> johannes

Re: [PATCH] prism54: correct assignment of DOT1XENABLE in WE-19 codepaths

[Johannes Berg]

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

On Tue, 2007-02-13 at 14:18 -0500, Dan Williams wrote:
> On Tue, 2007-02-13 at 20:02 +0100, Johannes Berg wrote:
> > On Tue, 2007-02-13 at 14:00 -0500, Dan Williams wrote:
> > > Correct assignment of DOT1XENABLE in WE-19 codepaths.
> > > RX_UNENCRYPTED_EAPOL = 1 really means setting DOT1XENABLE _off_, and
> > > vice versa.  The original WE-19 patch erroneously reversed that.  This
> > > patch fixes association with unencrypted and WEP networks when using
> > > wpa_supplicant.
> > > 
> > > It also adds two missing break statements that, left out, could result
> > > in incorrect card configuration.
> > > 
> > > Please commit to both development and stable branches.
> 
>                                           ^^^^^
> 
> Right; applicable to anything after _and_ including 2.6.19, which is
> when I think the WE-19 patch landed.

But I think John will take it to mean to apply it to wireless-dev and
wireless-2.6 so you should send it to stable@kernel.org

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 190 bytes --]

Re: [PATCH] prism54: correct assignment of DOT1XENABLE in WE-19 codepaths

[Dan Williams]

On Tue, 2007-02-13 at 20:20 +0100, Johannes Berg wrote:
> On Tue, 2007-02-13 at 14:18 -0500, Dan Williams wrote:
> > On Tue, 2007-02-13 at 20:02 +0100, Johannes Berg wrote:
> > > On Tue, 2007-02-13 at 14:00 -0500, Dan Williams wrote:
> > > > Correct assignment of DOT1XENABLE in WE-19 codepaths.
> > > > RX_UNENCRYPTED_EAPOL = 1 really means setting DOT1XENABLE _off_, and
> > > > vice versa.  The original WE-19 patch erroneously reversed that.  This
> > > > patch fixes association with unencrypted and WEP networks when using
> > > > wpa_supplicant.
> > > > 
> > > > It also adds two missing break statements that, left out, could result
> > > > in incorrect card configuration.
> > > > 
> > > > Please commit to both development and stable branches.
> > 
> >                                           ^^^^^
> > 
> > Right; applicable to anything after _and_ including 2.6.19, which is
> > when I think the WE-19 patch landed.
> 
> But I think John will take it to mean to apply it to wireless-dev and
> wireless-2.6 so you should send it to stable@kernel.org

Aha; ok.  Will do.

Dan