lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Dan Williams
2007-02-13 14:00:22 -05:00
committed by John W. Linville
parent 44956855ff
commit b5c4165164
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/prism54/isl_ioctl.c
View File

@@ -1395,11 +1395,16 @@ static int prism54_set_auth(struct net_device *ndev,
break; break;
case IW_AUTH_RX_UNENCRYPTED_EAPOL: 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; break;
case IW_AUTH_PRIVACY_INVOKED: case IW_AUTH_PRIVACY_INVOKED:
privinvoked = param->value ? 1 : 0; privinvoked = param->value ? 1 : 0;
break;
case IW_AUTH_DROP_UNENCRYPTED: case IW_AUTH_DROP_UNENCRYPTED:
exunencrypt = param->value ? 1 : 0; exunencrypt = param->value ? 1 : 0;
@@ -1589,6 +1594,7 @@ static int prism54_set_encodeext(struct net_device *ndev,
} }
key.type = DOT11_PRIV_TKIP; key.type = DOT11_PRIV_TKIP;
key.length = KEY_SIZE_TKIP; key.length = KEY_SIZE_TKIP;
break;
default: default:
return -EINVAL; return -EINVAL;
} }