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

Commit 63541212 authored by Aarthi Thiruvengadam's avatar Aarthi Thiruvengadam Committed by Kalle Valo
Browse files

ath6kl: add support for WPS 



Add control flag CONNECT_WPS_FLAG if a WPS IE is present in the
Association Request IEs. This flag is needed when the station must
connect to a WPS-enabled AP.

Signed-off-by: default avatarAarthi Thiruvengadam <athiruve@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 3ef987be

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

+18 −0
Original line number Diff line number Diff line
@@ -259,6 +259,14 @@ static bool ath6kl_is_rsn_ie(const u8 *pos) 
	return pos[0] == WLAN_EID_RSN;

}



static bool ath6kl_is_wps_ie(const u8 *pos)

{

	return (pos[0] == WLAN_EID_VENDOR_SPECIFIC &&

		pos[1] >= 4 &&

		pos[2] == 0x00 && pos[3] == 0x50 && pos[4] == 0xf2 &&

		pos[5] == 0x04);

}



static int ath6kl_set_assoc_req_ies(struct ath6kl_vif *vif, const u8 *ies,

				    size_t ies_len)

{
@@ -268,6 +276,12 @@ static int ath6kl_set_assoc_req_ies(struct ath6kl_vif *vif, const u8 *ies, 
	size_t len = 0;

	int ret;



	/*

	 * Clear previously set flag

	 */



	ar->connect_ctrl_flags &= ~CONNECT_WPS_FLAG;



	/*

	 * Filter out RSN/WPA IE(s)

	 */
@@ -285,6 +299,10 @@ static int ath6kl_set_assoc_req_ies(struct ath6kl_vif *vif, const u8 *ies, 
				memcpy(buf + len, pos, 2 + pos[1]);

				len += 2 + pos[1];

			}



			if (ath6kl_is_wps_ie(pos))

				ar->connect_ctrl_flags |= CONNECT_WPS_FLAG;



			pos += 2 + pos[1];

		}

	}

drivers/net/wireless/ath/ath6kl/wmi.h

+1 −0
Original line number Diff line number Diff line
@@ -626,6 +626,7 @@ enum wmi_connect_ctrl_flags_bits { 
	CONNECT_CSA_FOLLOW_BSS = 0x0020,

	CONNECT_DO_WPA_OFFLOAD = 0x0040,

	CONNECT_DO_NOT_DEAUTH = 0x0080,

	CONNECT_WPS_FLAG = 0x0100,

};



struct wmi_connect_cmd {