A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-17 10:12:28 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "qcacld-3.0: Remove obsolete MIC failure logic" into wlan-cld3.driver.lnx.2.0-dev

Browse source
This commit is contained in:
CNSS_WLAN Service 2017-10-20 00:02:55 -07:00 • committed by Gerrit - the friendly Code Review server
commit 26f70cab61
3 changed files with 16 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/hdd/inc/wlan_hdd_assoc.h
View file

@ -47,8 +47,6 @@
#define TDLS_STA_INDEX_VALID(staId) \
(((staId) >= 0) && ((staId) < 0xFF))
#endif
#define TKIP_COUNTER_MEASURE_STARTED 1
#define TKIP_COUNTER_MEASURE_STOPED 0
/* Timeout (in ms) for Link to Up before Registering Station */
#define ASSOC_LINKUP_TIMEOUT 60

3
core/hdd/inc/wlan_hdd_wext.h
View file

@ -221,9 +221,6 @@ struct hdd_wext_state {
/* qdf event */
qdf_event_t hdd_qdf_event;
/**Counter measure state, Started/Stopped*/
bool mTKIPCounterMeasures;
};
struct ccp_freq_chan_map {

66
core/hdd/src/wlan_hdd_assoc.c
View file

@ -3550,56 +3550,27 @@ static QDF_STATUS roam_ibss_connect_handler(struct hdd_adapter *adapter,
*
* This function indicates the Mic failure to the supplicant
*
* Return: QDF_STATUS enumeration
* Return: None
*/
static QDF_STATUS
static void
hdd_roam_mic_error_indication_handler(struct hdd_adapter *adapter,
tCsrRoamInfo *roam_info,
uint32_t roamId,
eRoamCmdStatus roamStatus,
eCsrRoamResult roamResult)
tCsrRoamInfo *roam_info)
{
struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
tSirMicFailureInfo *mic_failure_info;
if (eConnectionState_Associated == sta_ctx->conn_info.connState &&
TKIP_COUNTER_MEASURE_STOPED ==
sta_ctx->WextState.mTKIPCounterMeasures) {
struct iw_michaelmicfailure msg;
union iwreq_data wreq;
if (eConnectionState_Associated != sta_ctx->conn_info.connState)
return;
memset(&msg, '\0', sizeof(msg));
msg.src_addr.sa_family = ARPHRD_ETHER;
memcpy(msg.src_addr.sa_data,
roam_info->u.pMICFailureInfo->taMacAddr,
sizeof(roam_info->u.pMICFailureInfo->taMacAddr));
hdd_debug("MIC MAC " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(msg.src_addr.sa_data));
if (roam_info->u.pMICFailureInfo->multicast == true)
msg.flags = IW_MICFAILURE_GROUP;
else
msg.flags = IW_MICFAILURE_PAIRWISE;
memset(&wreq, 0, sizeof(wreq));
wreq.data.length = sizeof(msg);
wireless_send_event(adapter->dev, IWEVMICHAELMICFAILURE, &wreq,
(char *)&msg);
/* inform mic failure to nl80211 */
cfg80211_michael_mic_failure(adapter->dev,
roam_info->u.pMICFailureInfo->
taMacAddr,
((roam_info->u.pMICFailureInfo->
multicast ==
true) ?
NL80211_KEYTYPE_GROUP :
NL80211_KEYTYPE_PAIRWISE),
roam_info->u.pMICFailureInfo->
keyId,
roam_info->u.pMICFailureInfo->TSC,
GFP_KERNEL);
}
return QDF_STATUS_SUCCESS;
mic_failure_info = roam_info->u.pMICFailureInfo;
cfg80211_michael_mic_failure(adapter->dev,
mic_failure_info->taMacAddr,
mic_failure_info->multicast ?
NL80211_KEYTYPE_GROUP :
NL80211_KEYTYPE_PAIRWISE,
mic_failure_info->keyId,
mic_failure_info->TSC,
GFP_KERNEL);
}
/**
@ -4577,12 +4548,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *roam_info, uint32_t roamId,
break;
case eCSR_ROAM_MIC_ERROR_IND:
qdf_ret_status =
hdd_roam_mic_error_indication_handler(adapter,
roam_info,
roamId,
roamStatus,
roamResult);
hdd_roam_mic_error_indication_handler(adapter, roam_info);
break;
case eCSR_ROAM_SET_KEY_COMPLETE: