Skip to content

Commit

Permalink
[PATCH] prism54: correct assignment of DOT1XENABLE in WE-19 codepaths
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dan Williams authored and John W. Linville committed Feb 14, 2007
1 parent 4495685 commit b5c4165
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion drivers/net/wireless/prism54/isl_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit b5c4165

Please sign in to comment.