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

Commit 47168082 authored by Zhu Yi's avatar Zhu Yi Committed by John W. Linville
Browse files

[PATCH] ieee80211: Use IWEVGENIE to set WPA IE 



It replaces returning WPA/RSN IEs as custom events with returning them
as IWEVGENIE events. I have tested that it returns proper information
with both Xsupplicant, and the latest development version of the Linux
wireless tools.

Signed-off-by: default avatarChris Hessing <Chris.Hessing@utah.edu>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2c0f6316

net/ieee80211/ieee80211_wx.c

+10 −22
Original line number Diff line number Diff line
@@ -193,33 +193,21 @@ static char *ipw2100_translate_scan(struct ieee80211_device *ieee, 
	if (iwe.u.data.length)

		start = iwe_stream_add_point(start, stop, &iwe, custom);



	if (network->wpa_ie_len) {

		char buf[MAX_WPA_IE_LEN * 2 + 30];



		u8 *p = buf;

		p += sprintf(p, "wpa_ie=");

		for (i = 0; i < network->wpa_ie_len; i++) {

			p += sprintf(p, "%02x", network->wpa_ie[i]);

		}



	memset(&iwe, 0, sizeof(iwe));

		iwe.cmd = IWEVCUSTOM;

		iwe.u.data.length = strlen(buf);

	if (network->wpa_ie_len) {

		char buf[MAX_WPA_IE_LEN];

		memcpy(buf, network->wpa_ie, network->wpa_ie_len);

		iwe.cmd = IWEVGENIE;

		iwe.u.data.length = network->wpa_ie_len;

		start = iwe_stream_add_point(start, stop, &iwe, buf);

	}



	if (network->rsn_ie_len) {

		char buf[MAX_WPA_IE_LEN * 2 + 30];



		u8 *p = buf;

		p += sprintf(p, "rsn_ie=");

		for (i = 0; i < network->rsn_ie_len; i++) {

			p += sprintf(p, "%02x", network->rsn_ie[i]);

		}



	memset(&iwe, 0, sizeof(iwe));

		iwe.cmd = IWEVCUSTOM;

		iwe.u.data.length = strlen(buf);

	if (network->rsn_ie_len) {

		char buf[MAX_WPA_IE_LEN];

		memcpy(buf, network->rsn_ie, network->rsn_ie_len);

		iwe.cmd = IWEVGENIE;

		iwe.u.data.length = network->rsn_ie_len;

		start = iwe_stream_add_point(start, stop, &iwe, buf);

	}