wlan: Complete PMF (802.11w) support for Soft AP
These changes complete Protected Management Frames (802.11w)
support for the device in Soft AP mode.
The changes allow support for this feature without any changes
needed in hostapd or the cfg80211/nl80211 interface. Support
is completely done within the driver.
Change-Id: I3bb0ab9ae4eed0ff02f5d0d1d570b0886278d1e0
CRs-Fixed: 505740
diff --git a/CORE/HDD/inc/wlan_hdd_hostapd.h b/CORE/HDD/inc/wlan_hdd_hostapd.h
index 4af9006..0a433d5 100644
--- a/CORE/HDD/inc/wlan_hdd_hostapd.h
+++ b/CORE/HDD/inc/wlan_hdd_hostapd.h
@@ -81,10 +81,12 @@
void hdd_softap_sta_disassoc(hdd_adapter_t*,v_U8_t*);
void hdd_softap_tkip_mic_fail_counter_measure(hdd_adapter_t*,v_BOOL_t);
int hdd_softap_unpackIE( tHalHandle halHandle,
- eCsrEncryptionType *pEncryptType,
- eCsrEncryptionType *mcEncryptType,
- eCsrAuthType *pAuthType,
- u_int16_t gen_ie_len,
+ eCsrEncryptionType *pEncryptType,
+ eCsrEncryptionType *mcEncryptType,
+ eCsrAuthType *pAuthType,
+ v_BOOL_t *pMFPCapable,
+ v_BOOL_t *pMFPRequired,
+ u_int16_t gen_ie_len,
u_int8_t *gen_ie );
VOS_STATUS hdd_hostapd_SAPEventCB( tpSap_Event pSapEvent, v_PVOID_t usrDataForCallback);
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 6578dce..76a115b 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -959,13 +959,6 @@
sme_RegisterMgmtFrame(hHal, pAdapter->sessionId, type,
(v_U8_t*)WNM_BSS_ACTION_FRAME,
WNM_BSS_ACTION_FRAME_SIZE );
-
-#ifdef WLAN_FEATURE_11W
- /* SA Query Response Action Frame */
- sme_RegisterMgmtFrame(hHal, pAdapter->sessionId, type,
- (v_U8_t*)SA_QUERY_FRAME_RSP,
- SA_QUERY_FRAME_RSP_SIZE );
-#endif /* WLAN_FEATURE_11W */
}
void wlan_hdd_cfg80211_pre_voss_stop(hdd_adapter_t* pAdapter)
@@ -1868,6 +1861,8 @@
struct qc_mac_acl_entry *acl_entry = NULL;
v_SINT_t i;
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pHostapdAdapter);
+ v_BOOL_t MFPCapable;
+ v_BOOL_t MFPRequired;
ENTER();
@@ -2004,6 +1999,8 @@
&RSNEncryptType,
&mcRSNEncryptType,
&RSNAuthType,
+ &MFPCapable,
+ &MFPRequired,
pConfig->pRSNWPAReqIE[1]+2,
pConfig->pRSNWPAReqIE );
@@ -2043,6 +2040,8 @@
&RSNEncryptType,
&mcRSNEncryptType,
&RSNAuthType,
+ &MFPCapable,
+ &MFPRequired,
pConfig->pRSNWPAReqIE[1]+2,
pConfig->pRSNWPAReqIE );
@@ -2197,6 +2196,13 @@
pConfig->obssProtEnabled =
(WLAN_HDD_GET_CTX(pHostapdAdapter))->cfg_ini->apOBSSProtEnabled;
+#ifdef WLAN_FEATURE_11W
+ pConfig->mfpCapable = MFPCapable;
+ pConfig->mfpRequired = MFPRequired;
+ hddLog(LOGW, FL("Soft AP MFP capable %d, MFP required %d\n"),
+ pConfig->mfpCapable, pConfig->mfpRequired);
+#endif
+
hddLog(LOGW, FL("SOftAP macaddress : "MAC_ADDRESS_STR),
MAC_ADDR_ARRAY(pHostapdAdapter->macAddressCurrent.bytes));
hddLog(LOGW,FL("ssid =%s, beaconint=%d, channel=%d"),
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index ca00d1c..0218433 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -981,12 +981,15 @@
}
return VOS_STATUS_SUCCESS;
}
-int hdd_softap_unpackIE(
+
+int hdd_softap_unpackIE(
tHalHandle halHandle,
- eCsrEncryptionType *pEncryptType,
- eCsrEncryptionType *mcEncryptType,
- eCsrAuthType *pAuthType,
- u_int16_t gen_ie_len,
+ eCsrEncryptionType *pEncryptType,
+ eCsrEncryptionType *mcEncryptType,
+ eCsrAuthType *pAuthType,
+ v_BOOL_t *pMFPCapable,
+ v_BOOL_t *pMFPRequired,
+ u_int16_t gen_ie_len,
u_int8_t *gen_ie )
{
tDot11fIERSN dot11RSNIE;
@@ -1038,6 +1041,8 @@
//dot11RSNIE.gp_cipher_suite_count
*mcEncryptType = hdd_TranslateRSNToCsrEncryptionType(dot11RSNIE.gp_cipher_suite);
// Set the PMKSA ID Cache for this interface
+ *pMFPCapable = 0 != (dot11RSNIE.RSN_Cap[0] & 0x80);
+ *pMFPRequired = 0 != (dot11RSNIE.RSN_Cap[0] & 0x40);
// Calling csrRoamSetPMKIDCache to configure the PMKIDs into the cache
} else
@@ -1070,6 +1075,8 @@
*pEncryptType = hdd_TranslateWPAToCsrEncryptionType(dot11WPAIE.unicast_ciphers[0]);
//dot11WPAIE.unicast_cipher_count
*mcEncryptType = hdd_TranslateWPAToCsrEncryptionType(dot11WPAIE.multicast_cipher);
+ *pMFPCapable = VOS_FALSE;
+ *pMFPRequired = VOS_FALSE;
}
else
{
@@ -1907,6 +1914,8 @@
eCsrAuthType RSNAuthType;
eCsrEncryptionType RSNEncryptType;
eCsrEncryptionType mcRSNEncryptType;
+ v_BOOL_t MFPCapable;
+ v_BOOL_t MFPRequired;
pHostapdState = WLAN_HDD_GET_HOSTAP_STATE_PTR(pHostapdAdapter);
pCommitConfig = (s_CommitConfig_t *)extra;
@@ -1973,6 +1982,8 @@
&RSNEncryptType,
&mcRSNEncryptType,
&RSNAuthType,
+ &MFPCapable,
+ &MFPRequired,
pConfig->pRSNWPAReqIE[1]+2,
pConfig->pRSNWPAReqIE );