commit 6584723b2b8f007cd2c52e7f434c0662c6c69880
author CNSS_WLAN Service <cnssbldsw@qualcomm.com> Fri Aug 31 01:13:18 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Aug 31 01:13:18 2018 -0700
tree 614502defd8caec6bc01cb2ad3e0b88e20f01db5
parent 3740d295e07c4198b521ecae2425d6404b364a21
parent 47bc7624ecd77b7bff4906d7eef58cd0f74d7d34

Merge "wlan: Reset RRM_BIT  mask in Reassoc request frames as per BSS" into wlan-driver.lnx.1.0

CORE/MAC/src/pe/lim/limUtils.c

diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c
index 96ee524..547caff 100644
--- a/CORE/MAC/src/pe/lim/limUtils.c
+++ b/CORE/MAC/src/pe/lim/limUtils.c
@@ -8835,7 +8835,7 @@
  *
  * Update the capability info in Assoc/Reassoc request frames and reset
  * the spectrum management, short preamble, immediate block ack bits
- * if the BSS doesnot support it
+ * and rrm bit mask if the BSS doesnot support it
  *
  * Return: None
  */
@@ -8856,6 +8856,12 @@
           *caps &= (~LIM_IMMEDIATE_BLOCK_ACK_MASK);
           limLog(mac_ctx, LOG1, FL("Clearing Immed Blk Ack:no AP support"));
     }
+
+    if (!(bss_caps & LIM_RRM_BIT_MASK)) {
+          *caps &= (~LIM_RRM_BIT_MASK);
+          limLog(mac_ctx, LOG1,
+                 FL("Clearing radio measurement :no AP support"));
+    }
 }
 #ifdef SAP_AUTH_OFFLOAD
 /**