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

Commit 30677ae0 authored by Dai Shuibing's avatar Dai Shuibing Committed by Kalle Valo
Browse files

ath6kl: Indicate WAPI IE from (Re)Association Request frame 



This is needed to know whether the STA requests WAPI to be used and if
so, with what AKM and cipher.

Signed-off-by: default avatarDai Shuibing <shuibing@qca.qualcomm.com>
Signed-off-by: default avatarJouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent b8214df1

drivers/net/wireless/ath/ath6kl/main.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -534,6 +534,18 @@ void ath6kl_connect_ap_mode_sta(struct ath6kl_vif *vif, u16 aid, u8 *mac_addr, 
				wpa_ie = pos; /* WPS IE */

				wpa_ie = pos; /* WPS IE */

				break; /* overrides WPA/RSN IE */

				break; /* overrides WPA/RSN IE */

			}

			}

		} else if (pos[0] == 0x44 && wpa_ie == NULL) {

			/*

			 * Note: WAPI Parameter Set IE re-uses Element ID that

			 * was officially allocated for BSS AC Access Delay. As

			 * such, we need to be a bit more careful on when

			 * parsing the frame. However, BSS AC Access Delay

			 * element is not supposed to be included in

			 * (Re)Association Request frames, so this should not

			 * cause problems.

			 */

			wpa_ie = pos; /* WAPI IE */

			break;

		}

		}

		pos += 2 + pos[1];

		pos += 2 + pos[1];

	}

	}