Commit a82aedbf authored by Samuel Ortiz's avatar Samuel Ortiz Committed by John W. Linville
Browse files

iwmc3200wifi: WPS support 



By setting the WSC profile flag, we now support WPS as an enrollee.

Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 03d1a62c

drivers/net/wireless/iwmc3200wifi/cfg80211.c

+7 −0
Original line number Diff line number Diff line
@@ -627,6 +627,13 @@ static int iwm_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, 
		iwm->default_key = sme->key_idx;

	}



	/* WPA and open AUTH type from wpa_s means WPS (a.k.a. WSC) */

	if ((iwm->umac_profile->sec.flags &

	     (UMAC_SEC_FLG_WPA_ON_MSK | UMAC_SEC_FLG_RSNA_ON_MSK)) &&

	    iwm->umac_profile->sec.auth_type == UMAC_AUTH_TYPE_OPEN) {

			iwm->umac_profile->sec.flags = UMAC_SEC_FLG_WSC_ON_MSK;

	}



	ret = iwm_send_mlme_profile(iwm);



	if (iwm->umac_profile->sec.auth_type != UMAC_AUTH_TYPE_LEGACY_PSK ||

drivers/net/wireless/iwmc3200wifi/commands.h

+3 −0
Original line number Diff line number Diff line
@@ -288,6 +288,9 @@ struct iwm_umac_cmd_scan_request { 
/* iwm_umac_security.flag is WSC mode on -- bits [2:2] */

#define UMAC_SEC_FLG_WSC_ON_POS		2

#define UMAC_SEC_FLG_WSC_ON_SEED	1

#define UMAC_SEC_FLG_WSC_ON_MSK         (UMAC_SEC_FLG_WSC_ON_SEED << \

					 UMAC_SEC_FLG_WSC_ON_POS)





/* Legacy profile can use only WEP40 and WEP104 for encryption and

 * OPEN or PSK for authentication */