Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5c41651 authored by Dan Williams's avatar Dan Williams Committed by John W. Linville
Browse files

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



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: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 44956855

drivers/net/wireless/prism54/isl_ioctl.c

+7 −1
Original line number Diff line number Diff line
@@ -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;

		}