diff options
| author | CNSS_WLAN Service <cnssbldsw@qualcomm.com> | 2018-03-06 09:22:47 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-06 09:22:47 -0800 |
| commit | 86ab2c3059ab720f4beda13bc92a4fcbac31abc8 (patch) | |
| tree | 7bf0506c912a739065f635e2197e28ecdd0693c9 | |
| parent | 95788a2ac568ee93f14bb037dcf9e946c5556700 (diff) | |
| parent | 335a01817bad1e77872a3be816eb91a7851cec04 (diff) | |
Merge "qcacld-2.0: Fix repetitive channel switch count in CSAIE" into wlan-cld2.driver.lnx.1.0
| -rw-r--r-- | CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c | 4 | ||||
| -rw-r--r-- | CORE/MAC/src/pe/lim/limSendSmeRspMessages.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c index 83c5afc1f19b..10f886d9fdec 100644 --- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c +++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -7612,8 +7612,6 @@ limProcessSmeDfsCsaIeRequest(tpAniSirGlobal pMac, tANI_U32 *pMsg) psessionEntry->gLimChannelSwitch.secondarySubBand, psessionEntry); } - - psessionEntry->gLimChannelSwitch.switchCount--; } return; } diff --git a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c index 2603df2cba76..698f5381c78c 100644 --- a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c +++ b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c @@ -3501,6 +3501,8 @@ limProcessBeaconTxSuccessInd(tpAniSirGlobal pMac, tANI_U16 msgType, void *event) if (LIM_IS_AP_ROLE(psessionEntry) && VOS_TRUE == psessionEntry->dfsIncludeChanSwIe) { + /* Decrement the Channel Switch Count in CSAIE */ + psessionEntry->gLimChannelSwitch.switchCount--; /* Send only 5 beacons with CSA IE Set in when a radar is detected */ if (psessionEntry->gLimChannelSwitch.switchCount > 0) { @@ -3517,8 +3519,6 @@ limProcessBeaconTxSuccessInd(tpAniSirGlobal pMac, tANI_U16 msgType, void *event) psessionEntry); } - /* Decrement the IE count */ - psessionEntry->gLimChannelSwitch.switchCount--; } else { |