Merge "Release 1.0.0.213 QCACLD WLAN Driver"

22 files changed, 493 insertions, 714 deletions

diff --git a/CORE/CLD_TXRX/TLSHIM/tl_shim.c b/CORE/CLD_TXRX/TLSHIM/tl_shim.c
index 28e83287b822..9db8328e38d6 100644
--- a/CORE/CLD_TXRX/TLSHIM/tl_shim.c
+++ b/CORE/CLD_TXRX/TLSHIM/tl_shim.c
@@ -1255,20 +1255,6 @@ VOS_STATUS WLANTL_TxFreeMsg(void *vos_ctx, vos_msg_t *message)
 	return VOS_STATUS_SUCCESS;
 }
 
-/*
- * Txrx does weighted RR scheduling, set/get ac weights does not
- * apply here, this is no operation.
- */
-VOS_STATUS WLANTL_SetACWeights(void *vos_ctx, u_int8_t *ac_weight)
-{
-	return VOS_STATUS_SUCCESS;
-}
-
-VOS_STATUS WLANTL_GetACWeights(void *vos_ctx, u_int8_t *ac_weight)
-{
-	return VOS_STATUS_SUCCESS;
-}
-
 VOS_STATUS WLANTL_GetSoftAPStatistics(void *vos_ctx,
 				      WLANTL_TRANSFER_STA_TYPE *stats_sum,
 				      v_BOOL_t reset)
diff --git a/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h b/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h
index 15e548cbf0c8..4c8c421e8800 100644
--- a/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h
+++ b/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h
@@ -50,12 +50,6 @@
 #define HDD_SOFTAP_TX_VI_QUEUE_MAX_LEN (74*2)
 #define HDD_SOFTAP_TX_VO_QUEUE_MAX_LEN (70*2)
 
-/* SoftAP specific AC Weights */
-#define HDD_SOFTAP_BK_WEIGHT_DEFAULT                        1
-#define HDD_SOFTAP_BE_WEIGHT_DEFAULT                        3
-#define HDD_SOFTAP_VI_WEIGHT_DEFAULT                        8
-#define HDD_SOFTAP_VO_WEIGHT_DEFAULT                        18
-
 /*---------------------------------------------------------------------------
   Type declarations
   -------------------------------------------------------------------------*/
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index ef9372827498..1bec0c41aff2 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -723,10 +723,6 @@ static void hdd_SendAssociationEvent(struct net_device *dev,tCsrRoamInfo *pCsrRo
                                           &chan_info);
         }
 
-#ifdef WLAN_FEATURE_LPSS
-        wlan_hdd_send_status_pkg(pAdapter, pHddStaCtx, 1, 1);
-#endif
-
 #ifdef MSM_PLATFORM
 #ifdef CONFIG_CNSS
         /* start timer in sta/p2p_cli */
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 865daa4c0d57..eb57e62248f2 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -1055,7 +1055,7 @@ int is_driver_dfs_capable(struct wiphy *wiphy, struct wireless_dev *wdev,
     struct sk_buff *temp_skbuff;
     int ret_val;
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(3,4,0))
     dfs_capability = !!(wiphy->flags & WIPHY_FLAG_DFS_OFFLOAD);
 #endif
 
@@ -4415,7 +4415,7 @@ int wlan_hdd_cfg80211_init(struct device *dev,
     wiphy->vendor_events = wlan_hdd_cfg80211_vendor_events;
     wiphy->n_vendor_events = ARRAY_SIZE(wlan_hdd_cfg80211_vendor_events);
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(3,4,0))
     if (pCfg->enableDFSMasterCap) {
         wiphy->flags |= WIPHY_FLAG_DFS_OFFLOAD;
     }
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 78eccf23aa14..3b069b5d12a0 100755
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -449,7 +449,8 @@ void hdd_wlan_green_ap_mc(hdd_context_t *pHddCtx,
             break;
 
         case GREEN_AP_PS_STOP_EVENT:
-            green_ap->ps_enable = 0;
+            if (!(hdd_get_concurrency_mode() & VOS_SAP))
+                green_ap->ps_enable = 0;
             break;
 
         case GREEN_AP_ADD_STA_EVENT:
@@ -528,7 +529,7 @@ void hdd_wlan_green_ap_mc(hdd_context_t *pHddCtx,
                 }
                 hdd_wlan_green_ap_update(pHddCtx,
                     GREEN_AP_PS_OFF_STATE, GREEN_AP_PS_WAIT_EVENT);
-            } else if ((green_ap->ps_event = GREEN_AP_PS_WAIT_EVENT) &&
+            } else if ((green_ap->ps_event == GREEN_AP_PS_WAIT_EVENT) &&
                     (green_ap->ps_on_time)) {
 
                 /* ps_on_time timeout, switch to ps off */
@@ -8853,12 +8854,14 @@ hdd_adapter_t* hdd_open_adapter( hdd_context_t *pHddCtx, tANI_U8 session_type,
             return NULL;
           }
 
-         if (session_type == WLAN_HDD_INFRA_STATION)
-            pAdapter->wdev.iftype = NL80211_IFTYPE_STATION;
+         if (session_type == WLAN_HDD_P2P_CLIENT)
+            pAdapter->wdev.iftype = NL80211_IFTYPE_P2P_CLIENT;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0))
          else if (session_type == WLAN_HDD_P2P_DEVICE)
             pAdapter->wdev.iftype = NL80211_IFTYPE_P2P_DEVICE;
+#endif
          else
-            pAdapter->wdev.iftype = NL80211_IFTYPE_P2P_CLIENT;
+            pAdapter->wdev.iftype = NL80211_IFTYPE_STATION;
 
          pAdapter->device_mode = session_type;
 
diff --git a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
index e2360d80306b..b375e9ba5cde 100644
--- a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
@@ -583,13 +583,6 @@ VOS_STATUS hdd_softap_init_tx_rx( hdd_adapter_t *pAdapter )
 
    v_U8_t STAId = 0;
 
-   v_U8_t pACWeights[] = {
-                           HDD_SOFTAP_BK_WEIGHT_DEFAULT,
-                           HDD_SOFTAP_BE_WEIGHT_DEFAULT,
-                           HDD_SOFTAP_VI_WEIGHT_DEFAULT,
-                           HDD_SOFTAP_VO_WEIGHT_DEFAULT
-                         };
-
    pAdapter->isVosOutOfResource = VOS_FALSE;
    pAdapter->isVosLowResource = VOS_FALSE;
 
@@ -617,9 +610,6 @@ VOS_STATUS hdd_softap_init_tx_rx( hdd_adapter_t *pAdapter )
       }
    }
 
-   /* Update the AC weights suitable for SoftAP mode of operation */
-   WLANTL_SetACWeights((WLAN_HDD_GET_CTX(pAdapter))->pvosContext, pACWeights);
-
    return status;
 }
 
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index bce75d230908..7a116c4e9267 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -544,6 +544,11 @@ static const struct qwlan_hw qwlan_hw_list[] = {
         .id = AR6320_REV3_VERSION,
         .subid = 0x9,
         .name = "QCA6174_REV3_1",
+    },
+    {
+        .id = AR6320_REV3_2_VERSION,
+        .subid = 0xA,
+        .name = "QCA6174_REV3_2",
     }
 };
 
diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h
index 813d1ea29153..75547981d24a 100644
--- a/CORE/MAC/inc/qwlan_version.h
+++ b/CORE/MAC/inc/qwlan_version.h
@@ -42,9 +42,9 @@ BRIEF DESCRIPTION:
 #define QWLAN_VERSION_MINOR            0
 #define QWLAN_VERSION_PATCH            0
 #define QWLAN_VERSION_EXTRA            ""
-#define QWLAN_VERSION_BUILD            212
+#define QWLAN_VERSION_BUILD            213
 
-#define QWLAN_VERSIONSTR               "1.0.0.212"
+#define QWLAN_VERSIONSTR               "1.0.0.213"
 
 
 #define AR6320_REV1_VERSION             0x5000000
diff --git a/CORE/MAC/inc/wniCfgAp.h b/CORE/MAC/inc/wniCfgAp.h
index b5b2ce4121ce..d0b19fa522f2 100644
--- a/CORE/MAC/inc/wniCfgAp.h
+++ b/CORE/MAC/inc/wniCfgAp.h
@@ -143,212 +143,209 @@
 #define WNI_CFG_FORCE_POLICY_PROTECTION    96
 #define WNI_CFG_11G_SHORT_PREAMBLE_ENABLED    97
 #define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED    98
-#define WNI_CFG_CAL_PERIOD    99
-#define WNI_CFG_STATS_PERIOD    100
-#define WNI_CFG_CAL_CONTROL    101
-#define WNI_CFG_11G_ONLY_POLICY    102
-#define WNI_CFG_PACKET_CLASSIFICATION    103
-#define WNI_CFG_WME_ENABLED    104
-#define WNI_CFG_ADDTS_RSP_TIMEOUT    105
-#define WNI_CFG_MAX_SP_LENGTH    106
-#define WNI_CFG_KEEP_ALIVE_STA_LIMIT_THRESHOLD    107
-#define WNI_CFG_SEND_SINGLE_SSID_ALWAYS    108
-#define WNI_CFG_WSM_ENABLED    109
-#define WNI_CFG_EDCA_PROFILE    110
-#define WNI_CFG_EDCA_ANI_ACBK_LOCAL    111
-#define WNI_CFG_EDCA_ANI_ACBE_LOCAL    112
-#define WNI_CFG_EDCA_ANI_ACVI_LOCAL    113
-#define WNI_CFG_EDCA_ANI_ACVO_LOCAL    114
-#define WNI_CFG_EDCA_ANI_ACBK    115
-#define WNI_CFG_EDCA_ANI_ACBE    116
-#define WNI_CFG_EDCA_ANI_ACVI    117
-#define WNI_CFG_EDCA_ANI_ACVO    118
-#define WNI_CFG_EDCA_WME_ACBK_LOCAL    119
-#define WNI_CFG_EDCA_WME_ACBE_LOCAL    120
-#define WNI_CFG_EDCA_WME_ACVI_LOCAL    121
-#define WNI_CFG_EDCA_WME_ACVO_LOCAL    122
-#define WNI_CFG_EDCA_WME_ACBK    123
-#define WNI_CFG_EDCA_WME_ACBE    124
-#define WNI_CFG_EDCA_WME_ACVI    125
-#define WNI_CFG_EDCA_WME_ACVO    126
-#define WNI_CFG_RDET_FLAG    127
-#define WNI_CFG_RADAR_CHANNEL_LIST    128
-#define WNI_CFG_LOCAL_POWER_CONSTRAINT    129
-#define WNI_CFG_ADMIT_POLICY    130
-#define WNI_CFG_ADMIT_BWFACTOR    131
-#define WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE    132
-#define WNI_CFG_CHANNEL_BONDING_MODE    133
-#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE    134
-#define WNI_CFG_DYNAMIC_THRESHOLD_ZERO    135
-#define WNI_CFG_DYNAMIC_THRESHOLD_ONE    136
-#define WNI_CFG_DYNAMIC_THRESHOLD_TWO    137
-#define WNI_CFG_TRIG_STA_BK_SCAN    138
-#define WNI_CFG_DYNAMIC_PROFILE_SWITCHING    139
-#define WNI_CFG_SCAN_CONTROL_LIST    140
-#define WNI_CFG_MIMO_ENABLED    141
-#define WNI_CFG_BLOCK_ACK_ENABLED    142
-#define WNI_CFG_BA_ACTIVITY_CHECK_TIMEOUT    143
-#define WNI_CFG_HT_RX_STBC    144
-#define WNI_CFG_HT_CAP_INFO    145
-#define WNI_CFG_HT_AMPDU_PARAMS    146
-#define WNI_CFG_SUPPORTED_MCS_SET    147
-#define WNI_CFG_EXT_HT_CAP_INFO    148
-#define WNI_CFG_TX_BF_CAP    149
-#define WNI_CFG_AS_CAP    150
-#define WNI_CFG_HT_INFO_FIELD1    151
-#define WNI_CFG_HT_INFO_FIELD2    152
-#define WNI_CFG_HT_INFO_FIELD3    153
-#define WNI_CFG_BASIC_MCS_SET    154
-#define WNI_CFG_CURRENT_MCS_SET    155
-#define WNI_CFG_GREENFIELD_CAPABILITY    156
-#define WNI_CFG_VHT_MAX_MPDU_LENGTH    157
-#define WNI_CFG_VHT_SUPPORTED_CHAN_WIDTH_SET    158
-#define WNI_CFG_VHT_LDPC_CODING_CAP    159
-#define WNI_CFG_VHT_SHORT_GI_80MHZ    160
-#define WNI_CFG_VHT_SHORT_GI_160_AND_80_PLUS_80MHZ    161
-#define WNI_CFG_VHT_TXSTBC    162
-#define WNI_CFG_VHT_RXSTBC    163
-#define WNI_CFG_VHT_SU_BEAMFORMER_CAP    164
-#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP    165
-#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED    166
-#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS    167
-#define WNI_CFG_VHT_MU_BEAMFORMER_CAP    168
-#define WNI_CFG_VHT_MU_BEAMFORMEE_CAP    169
-#define WNI_CFG_VHT_TXOP_PS    170
-#define WNI_CFG_VHT_HTC_VHTC_CAP    171
-#define WNI_CFG_VHT_AMPDU_LEN_EXPONENT    172
-#define WNI_CFG_VHT_LINK_ADAPTATION_CAP    173
-#define WNI_CFG_VHT_RX_ANT_PATTERN    174
-#define WNI_CFG_VHT_TX_ANT_PATTERN    175
-#define WNI_CFG_VHT_RX_MCS_MAP    176
-#define WNI_CFG_VHT_TX_MCS_MAP    177
-#define WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE    178
-#define WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE    179
-#define WNI_CFG_VHT_CHANNEL_WIDTH    180
-#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1    181
-#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2    182
-#define WNI_CFG_VHT_BASIC_MCS_SET    183
-#define WNI_CFG_VHT_MU_MIMO_CAP_STA_COUNT    184
-#define WNI_CFG_VHT_SS_UNDER_UTIL    185
-#define WNI_CFG_VHT_40MHZ_UTILIZATION    186
-#define WNI_CFG_VHT_80MHZ_UTILIZATION    187
-#define WNI_CFG_VHT_160MHZ_UTILIZATION    188
-#define WNI_CFG_MAX_AMSDU_LENGTH    189
-#define WNI_CFG_MPDU_DENSITY    190
-#define WNI_CFG_NUM_BUFF_ADVERT    191
-#define WNI_CFG_MAX_RX_AMPDU_FACTOR    192
-#define WNI_CFG_SHORT_GI_20MHZ    193
-#define WNI_CFG_SHORT_GI_40MHZ    194
-#define WNI_CFG_RIFS_ENABLED    195
-#define WNI_CFG_MAX_PS_POLL    196
-#define WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE    197
-#define WNI_CFG_RSSI_FILTER_PERIOD    198
-#define WNI_CFG_MIN_RSSI_THRESHOLD    199
-#define WNI_CFG_NTH_BEACON_FILTER    200
-#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE    201
-#define WNI_CFG_SCAN_IN_POWERSAVE    202
-#define WNI_CFG_IGNORE_DTIM    203
-#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE    204
-#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE    205
-#define WNI_CFG_WOWLAN_DEAUTH_ENABLE    206
-#define WNI_CFG_WOWLAN_DISASSOC_ENABLE    207
-#define WNI_CFG_WOWLAN_MAX_MISSED_BEACON    208
-#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD    209
-#define WNI_CFG_BA_TIMEOUT    210
-#define WNI_CFG_BA_THRESHOLD_HIGH    211
-#define WNI_CFG_MAX_BA_BUFFERS    212
-#define WNI_CFG_MAX_BA_SESSIONS    213
-#define WNI_CFG_BA_AUTO_SETUP    214
-#define WNI_CFG_ADDBA_REQ_DECLINE    215
-#define WNI_CFG_DEL_ALL_RX_BA_SESSIONS_2_4_G_BTC    216
-#define WNI_CFG_BG_SCAN_CHANNEL_LIST    217
-#define WNI_CFG_MAX_MEDIUM_TIME    218
-#define WNI_CFG_MAX_MPDUS_IN_AMPDU    219
-#define WNI_CFG_IBSS_AUTO_BSSID    220
-#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG    221
-#define WNI_CFG_PROBE_REQ_ADDNIE_DATA    222
-#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG    223
-#define WNI_CFG_PROBE_RSP_ADDNIE_DATA1    224
-#define WNI_CFG_PROBE_RSP_ADDNIE_DATA2    225
-#define WNI_CFG_PROBE_RSP_ADDNIE_DATA3    226
-#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG    227
-#define WNI_CFG_ASSOC_RSP_ADDNIE_DATA    228
-#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG    229
-#define WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA    230
-#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG    231
-#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA    232
-#define WNI_CFG_WPS_ENABLE    233
-#define WNI_CFG_WPS_STATE    234
-#define WNI_CFG_WPS_PROBE_REQ_FLAG    235
-#define WNI_CFG_WPS_VERSION    236
-#define WNI_CFG_WPS_REQUEST_TYPE    237
-#define WNI_CFG_WPS_CFG_METHOD    238
-#define WNI_CFG_WPS_UUID    239
-#define WNI_CFG_WPS_PRIMARY_DEVICE_CATEGORY    240
-#define WNI_CFG_WPS_PIMARY_DEVICE_OUI    241
-#define WNI_CFG_WPS_DEVICE_SUB_CATEGORY    242
-#define WNI_CFG_WPS_ASSOCIATION_STATE    243
-#define WNI_CFG_WPS_CONFIGURATION_ERROR    244
-#define WNI_CFG_WPS_DEVICE_PASSWORD_ID    245
-#define WNI_CFG_WPS_ASSOC_METHOD    246
-#define WNI_CFG_LOW_GAIN_OVERRIDE    247
-#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE    248
-#define WNI_CFG_RPE_POLLING_THRESHOLD    249
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG    250
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG    251
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG    252
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG    253
-#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS    254
-#define WNI_CFG_SINGLE_TID_RC    255
-#define WNI_CFG_RRM_ENABLED    256
-#define WNI_CFG_RRM_OPERATING_CHAN_MAX    257
-#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX    258
-#define WNI_CFG_TX_PWR_CTRL_ENABLE    259
-#define WNI_CFG_MCAST_BCAST_FILTER_SETTING    260
-#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK    261
-#define WNI_CFG_DYNAMIC_PS_POLL_VALUE    262
-#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT    263
-#define WNI_CFG_TELE_BCN_WAKEUP_EN    264
-#define WNI_CFG_TELE_BCN_TRANS_LI    265
-#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS    266
-#define WNI_CFG_TELE_BCN_MAX_LI    267
-#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS    268
-#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS    269
-#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD    270
-#define WNI_CFG_ASSOC_STA_LIMIT    271
-#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL    272
-#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL    273
-#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND    274
-#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD    275
-#define WNI_CFG_ENABLE_CLOSE_LOOP    276
-#define WNI_CFG_ENABLE_LTE_COEX    277
-#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT    278
-#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT    279
-#define WNI_CFG_ENABLE_MC_ADDR_LIST    280
-#define WNI_CFG_ENABLE_UC_FILTER    281
-#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION    282
-#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED    283
-#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP    284
-#define WNI_CFG_AP_LINK_MONITOR_TIMEOUT    285
-#define WNI_CFG_TDLS_QOS_WMM_UAPSD_MASK    286
-#define WNI_CFG_TDLS_BUF_STA_ENABLED    287
-#define WNI_CFG_TDLS_PUAPSD_INACT_TIME    288
-#define WNI_CFG_TDLS_RX_FRAME_THRESHOLD    289
-#define WNI_CFG_PMF_SA_QUERY_MAX_RETRIES    290
-#define WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL    291
-#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN    292
-#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR    293
-#define WNI_CFG_ANTENNA_DIVESITY    294
-#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT    295
-#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY    296
-#define WNI_CFG_CURRENT_RSSI    297
-#define WNI_CFG_RTT3_ENABLE    298
-#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL    299
-#define WNI_CFG_TDLS_OFF_CHANNEL_ENABLED    300
-#define WNI_CFG_IBSS_ATIM_WIN_SIZE    301
-#define WNI_CFG_DFS_MASTER_ENABLED    302
-#define WNI_CFG_VHT_ENABLE_TXBF_20MHZ    303
-#define WNI_CFG_TDLS_WMM_MODE_ENABLED    304
+#define WNI_CFG_11G_ONLY_POLICY    99
+#define WNI_CFG_PACKET_CLASSIFICATION    100
+#define WNI_CFG_WME_ENABLED    101
+#define WNI_CFG_ADDTS_RSP_TIMEOUT    102
+#define WNI_CFG_MAX_SP_LENGTH    103
+#define WNI_CFG_KEEP_ALIVE_STA_LIMIT_THRESHOLD    104
+#define WNI_CFG_SEND_SINGLE_SSID_ALWAYS    105
+#define WNI_CFG_WSM_ENABLED    106
+#define WNI_CFG_EDCA_PROFILE    107
+#define WNI_CFG_EDCA_ANI_ACBK_LOCAL    108
+#define WNI_CFG_EDCA_ANI_ACBE_LOCAL    109
+#define WNI_CFG_EDCA_ANI_ACVI_LOCAL    110
+#define WNI_CFG_EDCA_ANI_ACVO_LOCAL    111
+#define WNI_CFG_EDCA_ANI_ACBK    112
+#define WNI_CFG_EDCA_ANI_ACBE    113
+#define WNI_CFG_EDCA_ANI_ACVI    114
+#define WNI_CFG_EDCA_ANI_ACVO    115
+#define WNI_CFG_EDCA_WME_ACBK_LOCAL    116
+#define WNI_CFG_EDCA_WME_ACBE_LOCAL    117
+#define WNI_CFG_EDCA_WME_ACVI_LOCAL    118
+#define WNI_CFG_EDCA_WME_ACVO_LOCAL    119
+#define WNI_CFG_EDCA_WME_ACBK    120
+#define WNI_CFG_EDCA_WME_ACBE    121
+#define WNI_CFG_EDCA_WME_ACVI    122
+#define WNI_CFG_EDCA_WME_ACVO    123
+#define WNI_CFG_RDET_FLAG    124
+#define WNI_CFG_RADAR_CHANNEL_LIST    125
+#define WNI_CFG_LOCAL_POWER_CONSTRAINT    126
+#define WNI_CFG_ADMIT_POLICY    127
+#define WNI_CFG_ADMIT_BWFACTOR    128
+#define WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE    129
+#define WNI_CFG_CHANNEL_BONDING_MODE    130
+#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE    131
+#define WNI_CFG_DYNAMIC_THRESHOLD_ZERO    132
+#define WNI_CFG_DYNAMIC_THRESHOLD_ONE    133
+#define WNI_CFG_DYNAMIC_THRESHOLD_TWO    134
+#define WNI_CFG_TRIG_STA_BK_SCAN    135
+#define WNI_CFG_DYNAMIC_PROFILE_SWITCHING    136
+#define WNI_CFG_SCAN_CONTROL_LIST    137
+#define WNI_CFG_MIMO_ENABLED    138
+#define WNI_CFG_BLOCK_ACK_ENABLED    139
+#define WNI_CFG_BA_ACTIVITY_CHECK_TIMEOUT    140
+#define WNI_CFG_HT_RX_STBC    141
+#define WNI_CFG_HT_CAP_INFO    142
+#define WNI_CFG_HT_AMPDU_PARAMS    143
+#define WNI_CFG_SUPPORTED_MCS_SET    144
+#define WNI_CFG_EXT_HT_CAP_INFO    145
+#define WNI_CFG_TX_BF_CAP    146
+#define WNI_CFG_AS_CAP    147
+#define WNI_CFG_HT_INFO_FIELD1    148
+#define WNI_CFG_HT_INFO_FIELD2    149
+#define WNI_CFG_HT_INFO_FIELD3    150
+#define WNI_CFG_BASIC_MCS_SET    151
+#define WNI_CFG_CURRENT_MCS_SET    152
+#define WNI_CFG_GREENFIELD_CAPABILITY    153
+#define WNI_CFG_VHT_MAX_MPDU_LENGTH    154
+#define WNI_CFG_VHT_SUPPORTED_CHAN_WIDTH_SET    155
+#define WNI_CFG_VHT_LDPC_CODING_CAP    156
+#define WNI_CFG_VHT_SHORT_GI_80MHZ    157
+#define WNI_CFG_VHT_SHORT_GI_160_AND_80_PLUS_80MHZ    158
+#define WNI_CFG_VHT_TXSTBC    159
+#define WNI_CFG_VHT_RXSTBC    160
+#define WNI_CFG_VHT_SU_BEAMFORMER_CAP    161
+#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP    162
+#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED    163
+#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS    164
+#define WNI_CFG_VHT_MU_BEAMFORMER_CAP    165
+#define WNI_CFG_VHT_MU_BEAMFORMEE_CAP    166
+#define WNI_CFG_VHT_TXOP_PS    167
+#define WNI_CFG_VHT_HTC_VHTC_CAP    168
+#define WNI_CFG_VHT_AMPDU_LEN_EXPONENT    169
+#define WNI_CFG_VHT_LINK_ADAPTATION_CAP    170
+#define WNI_CFG_VHT_RX_ANT_PATTERN    171
+#define WNI_CFG_VHT_TX_ANT_PATTERN    172
+#define WNI_CFG_VHT_RX_MCS_MAP    173
+#define WNI_CFG_VHT_TX_MCS_MAP    174
+#define WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE    175
+#define WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE    176
+#define WNI_CFG_VHT_CHANNEL_WIDTH    177
+#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1    178
+#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2    179
+#define WNI_CFG_VHT_BASIC_MCS_SET    180
+#define WNI_CFG_VHT_MU_MIMO_CAP_STA_COUNT    181
+#define WNI_CFG_VHT_SS_UNDER_UTIL    182
+#define WNI_CFG_VHT_40MHZ_UTILIZATION    183
+#define WNI_CFG_VHT_80MHZ_UTILIZATION    184
+#define WNI_CFG_VHT_160MHZ_UTILIZATION    185
+#define WNI_CFG_MAX_AMSDU_LENGTH    186
+#define WNI_CFG_MPDU_DENSITY    187
+#define WNI_CFG_NUM_BUFF_ADVERT    188
+#define WNI_CFG_MAX_RX_AMPDU_FACTOR    189
+#define WNI_CFG_SHORT_GI_20MHZ    190
+#define WNI_CFG_SHORT_GI_40MHZ    191
+#define WNI_CFG_RIFS_ENABLED    192
+#define WNI_CFG_MAX_PS_POLL    193
+#define WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE    194
+#define WNI_CFG_RSSI_FILTER_PERIOD    195
+#define WNI_CFG_MIN_RSSI_THRESHOLD    196
+#define WNI_CFG_NTH_BEACON_FILTER    197
+#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE    198
+#define WNI_CFG_SCAN_IN_POWERSAVE    199
+#define WNI_CFG_IGNORE_DTIM    200
+#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE    201
+#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE    202
+#define WNI_CFG_WOWLAN_DEAUTH_ENABLE    203
+#define WNI_CFG_WOWLAN_DISASSOC_ENABLE    204
+#define WNI_CFG_WOWLAN_MAX_MISSED_BEACON    205
+#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD    206
+#define WNI_CFG_BA_TIMEOUT    207
+#define WNI_CFG_BA_THRESHOLD_HIGH    208
+#define WNI_CFG_MAX_BA_BUFFERS    209
+#define WNI_CFG_MAX_BA_SESSIONS    210
+#define WNI_CFG_BA_AUTO_SETUP    211
+#define WNI_CFG_ADDBA_REQ_DECLINE    212
+#define WNI_CFG_DEL_ALL_RX_BA_SESSIONS_2_4_G_BTC    213
+#define WNI_CFG_BG_SCAN_CHANNEL_LIST    214
+#define WNI_CFG_MAX_MEDIUM_TIME    215
+#define WNI_CFG_MAX_MPDUS_IN_AMPDU    216
+#define WNI_CFG_IBSS_AUTO_BSSID    217
+#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG    218
+#define WNI_CFG_PROBE_REQ_ADDNIE_DATA    219
+#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG    220
+#define WNI_CFG_PROBE_RSP_ADDNIE_DATA1    221
+#define WNI_CFG_PROBE_RSP_ADDNIE_DATA2    222
+#define WNI_CFG_PROBE_RSP_ADDNIE_DATA3    223
+#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG    224
+#define WNI_CFG_ASSOC_RSP_ADDNIE_DATA    225
+#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG    226
+#define WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA    227
+#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG    228
+#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA    229
+#define WNI_CFG_WPS_ENABLE    230
+#define WNI_CFG_WPS_STATE    231
+#define WNI_CFG_WPS_PROBE_REQ_FLAG    232
+#define WNI_CFG_WPS_VERSION    233
+#define WNI_CFG_WPS_REQUEST_TYPE    234
+#define WNI_CFG_WPS_CFG_METHOD    235
+#define WNI_CFG_WPS_UUID    236
+#define WNI_CFG_WPS_PRIMARY_DEVICE_CATEGORY    237
+#define WNI_CFG_WPS_PIMARY_DEVICE_OUI    238
+#define WNI_CFG_WPS_DEVICE_SUB_CATEGORY    239
+#define WNI_CFG_WPS_ASSOCIATION_STATE    240
+#define WNI_CFG_WPS_CONFIGURATION_ERROR    241
+#define WNI_CFG_WPS_DEVICE_PASSWORD_ID    242
+#define WNI_CFG_WPS_ASSOC_METHOD    243
+#define WNI_CFG_LOW_GAIN_OVERRIDE    244
+#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE    245
+#define WNI_CFG_RPE_POLLING_THRESHOLD    246
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG    247
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG    248
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG    249
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG    250
+#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS    251
+#define WNI_CFG_SINGLE_TID_RC    252
+#define WNI_CFG_RRM_ENABLED    253
+#define WNI_CFG_RRM_OPERATING_CHAN_MAX    254
+#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX    255
+#define WNI_CFG_TX_PWR_CTRL_ENABLE    256
+#define WNI_CFG_MCAST_BCAST_FILTER_SETTING    257
+#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK    258
+#define WNI_CFG_DYNAMIC_PS_POLL_VALUE    259
+#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT    260
+#define WNI_CFG_TELE_BCN_WAKEUP_EN    261
+#define WNI_CFG_TELE_BCN_TRANS_LI    262
+#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS    263
+#define WNI_CFG_TELE_BCN_MAX_LI    264
+#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS    265
+#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS    266
+#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD    267
+#define WNI_CFG_ASSOC_STA_LIMIT    268
+#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL    269
+#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL    270
+#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND    271
+#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD    272
+#define WNI_CFG_ENABLE_CLOSE_LOOP    273
+#define WNI_CFG_ENABLE_LTE_COEX    274
+#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT    275
+#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT    276
+#define WNI_CFG_ENABLE_MC_ADDR_LIST    277
+#define WNI_CFG_ENABLE_UC_FILTER    278
+#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION    279
+#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED    280
+#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP    281
+#define WNI_CFG_AP_LINK_MONITOR_TIMEOUT    282
+#define WNI_CFG_TDLS_QOS_WMM_UAPSD_MASK    283
+#define WNI_CFG_TDLS_BUF_STA_ENABLED    284
+#define WNI_CFG_TDLS_PUAPSD_INACT_TIME    285
+#define WNI_CFG_TDLS_RX_FRAME_THRESHOLD    286
+#define WNI_CFG_PMF_SA_QUERY_MAX_RETRIES    287
+#define WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL    288
+#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN    289
+#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR    290
+#define WNI_CFG_ANTENNA_DIVESITY    291
+#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT    292
+#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY    293
+#define WNI_CFG_CURRENT_RSSI    294
+#define WNI_CFG_RTT3_ENABLE    295
+#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL    296
+#define WNI_CFG_TDLS_OFF_CHANNEL_ENABLED    297
+#define WNI_CFG_IBSS_ATIM_WIN_SIZE    298
+#define WNI_CFG_DFS_MASTER_ENABLED    299
+#define WNI_CFG_VHT_ENABLE_TXBF_20MHZ    300
+#define WNI_CFG_TDLS_WMM_MODE_ENABLED    301
 
 /*
  * String parameter lengths
@@ -1098,33 +1095,6 @@
 #define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED_APMAX    1
 #define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED_APDEF    1
 
-#define WNI_CFG_CAL_PERIOD_STAMIN    2
-#define WNI_CFG_CAL_PERIOD_STAMAX    10
-#define WNI_CFG_CAL_PERIOD_STADEF    5
-
-#define WNI_CFG_CAL_PERIOD_APMIN    2
-#define WNI_CFG_CAL_PERIOD_APMAX    10
-#define WNI_CFG_CAL_PERIOD_APDEF    5
-
-#define WNI_CFG_STATS_PERIOD_STAMIN    1
-#define WNI_CFG_STATS_PERIOD_STAMAX    10
-#define WNI_CFG_STATS_PERIOD_STADEF    10
-
-#define WNI_CFG_STATS_PERIOD_APMIN    1
-#define WNI_CFG_STATS_PERIOD_APMAX    10
-#define WNI_CFG_STATS_PERIOD_APDEF    10
-
-#define WNI_CFG_CAL_CONTROL_STAMIN    0
-#define WNI_CFG_CAL_CONTROL_STAMAX    1
-#define WNI_CFG_CAL_CONTROL_STADEF    0
-
-#define WNI_CFG_CAL_CONTROL_APMIN    0
-#define WNI_CFG_CAL_CONTROL_APMAX    1
-#define WNI_CFG_CAL_CONTROL_APDEF    0
-
-#define WNI_CFG_CAL_CONTROL_CAL_ON    0
-#define WNI_CFG_CAL_CONTROL_CAL_OFF    1
-
 #define WNI_CFG_11G_ONLY_POLICY_STAMIN    0
 #define WNI_CFG_11G_ONLY_POLICY_STAMAX    1
 #define WNI_CFG_11G_ONLY_POLICY_STADEF    0
@@ -2578,10 +2548,10 @@
 #define WNI_CFG_TDLS_WMM_MODE_ENABLED_APMAX    1
 #define WNI_CFG_TDLS_WMM_MODE_ENABLED_APDEF    0
 
-#define CFG_PARAM_MAX_NUM         305
-#define CFG_AP_IBUF_MAX_SIZE      253
+#define CFG_PARAM_MAX_NUM         302
+#define CFG_AP_IBUF_MAX_SIZE      250
 #define CFG_AP_SBUF_MAX_SIZE      3238
-#define CFG_STA_IBUF_MAX_SIZE     248
+#define CFG_STA_IBUF_MAX_SIZE     245
 #define CFG_STA_SBUF_MAX_SIZE     3204
 #define CFG_SEM_MAX_NUM           19
 
diff --git a/CORE/MAC/inc/wniCfgSta.h b/CORE/MAC/inc/wniCfgSta.h
index 10cb585692b2..6dea1a502425 100644
--- a/CORE/MAC/inc/wniCfgSta.h
+++ b/CORE/MAC/inc/wniCfgSta.h
@@ -138,211 +138,208 @@
 #define WNI_CFG_FORCE_POLICY_PROTECTION    96
 #define WNI_CFG_11G_SHORT_PREAMBLE_ENABLED    97
 #define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED    98
-#define WNI_CFG_CAL_PERIOD    99
-#define WNI_CFG_STATS_PERIOD    100
-#define WNI_CFG_CAL_CONTROL    101
-#define WNI_CFG_11G_ONLY_POLICY    102
-#define WNI_CFG_PACKET_CLASSIFICATION    103
-#define WNI_CFG_WME_ENABLED    104
-#define WNI_CFG_ADDTS_RSP_TIMEOUT    105
-#define WNI_CFG_MAX_SP_LENGTH    106
-#define WNI_CFG_SEND_SINGLE_SSID_ALWAYS    108
-#define WNI_CFG_WSM_ENABLED    109
-#define WNI_CFG_EDCA_PROFILE    110
-#define WNI_CFG_EDCA_ANI_ACBK_LOCAL    111
-#define WNI_CFG_EDCA_ANI_ACBE_LOCAL    112
-#define WNI_CFG_EDCA_ANI_ACVI_LOCAL    113
-#define WNI_CFG_EDCA_ANI_ACVO_LOCAL    114
-#define WNI_CFG_EDCA_ANI_ACBK    115
-#define WNI_CFG_EDCA_ANI_ACBE    116
-#define WNI_CFG_EDCA_ANI_ACVI    117
-#define WNI_CFG_EDCA_ANI_ACVO    118
-#define WNI_CFG_EDCA_WME_ACBK_LOCAL    119
-#define WNI_CFG_EDCA_WME_ACBE_LOCAL    120
-#define WNI_CFG_EDCA_WME_ACVI_LOCAL    121
-#define WNI_CFG_EDCA_WME_ACVO_LOCAL    122
-#define WNI_CFG_EDCA_WME_ACBK    123
-#define WNI_CFG_EDCA_WME_ACBE    124
-#define WNI_CFG_EDCA_WME_ACVI    125
-#define WNI_CFG_EDCA_WME_ACVO    126
-#define WNI_CFG_RDET_FLAG    127
-#define WNI_CFG_RADAR_CHANNEL_LIST    128
-#define WNI_CFG_LOCAL_POWER_CONSTRAINT    129
-#define WNI_CFG_ADMIT_POLICY    130
-#define WNI_CFG_ADMIT_BWFACTOR    131
-#define WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE    132
-#define WNI_CFG_CHANNEL_BONDING_MODE    133
-#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE    134
-#define WNI_CFG_DYNAMIC_THRESHOLD_ZERO    135
-#define WNI_CFG_DYNAMIC_THRESHOLD_ONE    136
-#define WNI_CFG_DYNAMIC_THRESHOLD_TWO    137
-#define WNI_CFG_TRIG_STA_BK_SCAN    138
-#define WNI_CFG_DYNAMIC_PROFILE_SWITCHING    139
-#define WNI_CFG_SCAN_CONTROL_LIST    140
-#define WNI_CFG_MIMO_ENABLED    141
-#define WNI_CFG_BLOCK_ACK_ENABLED    142
-#define WNI_CFG_BA_ACTIVITY_CHECK_TIMEOUT    143
-#define WNI_CFG_HT_RX_STBC    144
-#define WNI_CFG_HT_CAP_INFO    145
-#define WNI_CFG_HT_AMPDU_PARAMS    146
-#define WNI_CFG_SUPPORTED_MCS_SET    147
-#define WNI_CFG_EXT_HT_CAP_INFO    148
-#define WNI_CFG_TX_BF_CAP    149
-#define WNI_CFG_AS_CAP    150
-#define WNI_CFG_HT_INFO_FIELD1    151
-#define WNI_CFG_HT_INFO_FIELD2    152
-#define WNI_CFG_HT_INFO_FIELD3    153
-#define WNI_CFG_BASIC_MCS_SET    154
-#define WNI_CFG_CURRENT_MCS_SET    155
-#define WNI_CFG_GREENFIELD_CAPABILITY    156
-#define WNI_CFG_VHT_MAX_MPDU_LENGTH    157
-#define WNI_CFG_VHT_SUPPORTED_CHAN_WIDTH_SET    158
-#define WNI_CFG_VHT_LDPC_CODING_CAP    159
-#define WNI_CFG_VHT_SHORT_GI_80MHZ    160
-#define WNI_CFG_VHT_SHORT_GI_160_AND_80_PLUS_80MHZ    161
-#define WNI_CFG_VHT_TXSTBC    162
-#define WNI_CFG_VHT_RXSTBC    163
-#define WNI_CFG_VHT_SU_BEAMFORMER_CAP    164
-#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP    165
-#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED    166
-#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS    167
-#define WNI_CFG_VHT_MU_BEAMFORMER_CAP    168
-#define WNI_CFG_VHT_MU_BEAMFORMEE_CAP    169
-#define WNI_CFG_VHT_TXOP_PS    170
-#define WNI_CFG_VHT_HTC_VHTC_CAP    171
-#define WNI_CFG_VHT_AMPDU_LEN_EXPONENT    172
-#define WNI_CFG_VHT_LINK_ADAPTATION_CAP    173
-#define WNI_CFG_VHT_RX_ANT_PATTERN    174
-#define WNI_CFG_VHT_TX_ANT_PATTERN    175
-#define WNI_CFG_VHT_RX_MCS_MAP    176
-#define WNI_CFG_VHT_TX_MCS_MAP    177
-#define WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE    178
-#define WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE    179
-#define WNI_CFG_VHT_CHANNEL_WIDTH    180
-#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1    181
-#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2    182
-#define WNI_CFG_VHT_BASIC_MCS_SET    183
-#define WNI_CFG_VHT_MU_MIMO_CAP_STA_COUNT    184
-#define WNI_CFG_VHT_SS_UNDER_UTIL    185
-#define WNI_CFG_VHT_40MHZ_UTILIZATION    186
-#define WNI_CFG_VHT_80MHZ_UTILIZATION    187
-#define WNI_CFG_VHT_160MHZ_UTILIZATION    188
-#define WNI_CFG_MAX_AMSDU_LENGTH    189
-#define WNI_CFG_MPDU_DENSITY    190
-#define WNI_CFG_NUM_BUFF_ADVERT    191
-#define WNI_CFG_MAX_RX_AMPDU_FACTOR    192
-#define WNI_CFG_SHORT_GI_20MHZ    193
-#define WNI_CFG_SHORT_GI_40MHZ    194
-#define WNI_CFG_RIFS_ENABLED    195
-#define WNI_CFG_MAX_PS_POLL    196
-#define WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE    197
-#define WNI_CFG_RSSI_FILTER_PERIOD    198
-#define WNI_CFG_MIN_RSSI_THRESHOLD    199
-#define WNI_CFG_NTH_BEACON_FILTER    200
-#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE    201
-#define WNI_CFG_SCAN_IN_POWERSAVE    202
-#define WNI_CFG_IGNORE_DTIM    203
-#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE    204
-#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE    205
-#define WNI_CFG_WOWLAN_DEAUTH_ENABLE    206
-#define WNI_CFG_WOWLAN_DISASSOC_ENABLE    207
-#define WNI_CFG_WOWLAN_MAX_MISSED_BEACON    208
-#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD    209
-#define WNI_CFG_BA_TIMEOUT    210
-#define WNI_CFG_BA_THRESHOLD_HIGH    211
-#define WNI_CFG_MAX_BA_BUFFERS    212
-#define WNI_CFG_MAX_BA_SESSIONS    213
-#define WNI_CFG_BA_AUTO_SETUP    214
-#define WNI_CFG_ADDBA_REQ_DECLINE    215
-#define WNI_CFG_DEL_ALL_RX_BA_SESSIONS_2_4_G_BTC    216
-#define WNI_CFG_BG_SCAN_CHANNEL_LIST    217
-#define WNI_CFG_MAX_MEDIUM_TIME    218
-#define WNI_CFG_MAX_MPDUS_IN_AMPDU    219
-#define WNI_CFG_IBSS_AUTO_BSSID    220
-#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG    221
-#define WNI_CFG_PROBE_REQ_ADDNIE_DATA    222
-#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG    223
-#define WNI_CFG_PROBE_RSP_ADDNIE_DATA1    224
-#define WNI_CFG_PROBE_RSP_ADDNIE_DATA2    225
-#define WNI_CFG_PROBE_RSP_ADDNIE_DATA3    226
-#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG    227
-#define WNI_CFG_ASSOC_RSP_ADDNIE_DATA    228
-#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG    229
-#define WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA    230
-#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG    231
-#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA    232
-#define WNI_CFG_WPS_ENABLE    233
-#define WNI_CFG_WPS_STATE    234
-#define WNI_CFG_WPS_PROBE_REQ_FLAG    235
-#define WNI_CFG_WPS_VERSION    236
-#define WNI_CFG_WPS_REQUEST_TYPE    237
-#define WNI_CFG_WPS_CFG_METHOD    238
-#define WNI_CFG_WPS_UUID    239
-#define WNI_CFG_WPS_PRIMARY_DEVICE_CATEGORY    240
-#define WNI_CFG_WPS_PIMARY_DEVICE_OUI    241
-#define WNI_CFG_WPS_DEVICE_SUB_CATEGORY    242
-#define WNI_CFG_WPS_ASSOCIATION_STATE    243
-#define WNI_CFG_WPS_CONFIGURATION_ERROR    244
-#define WNI_CFG_WPS_DEVICE_PASSWORD_ID    245
-#define WNI_CFG_WPS_ASSOC_METHOD    246
-#define WNI_CFG_LOW_GAIN_OVERRIDE    247
-#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE    248
-#define WNI_CFG_RPE_POLLING_THRESHOLD    249
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG    250
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG    251
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG    252
-#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG    253
-#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS    254
-#define WNI_CFG_SINGLE_TID_RC    255
-#define WNI_CFG_RRM_ENABLED    256
-#define WNI_CFG_RRM_OPERATING_CHAN_MAX    257
-#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX    258
-#define WNI_CFG_TX_PWR_CTRL_ENABLE    259
-#define WNI_CFG_MCAST_BCAST_FILTER_SETTING    260
-#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK    261
-#define WNI_CFG_DYNAMIC_PS_POLL_VALUE    262
-#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT    263
-#define WNI_CFG_TELE_BCN_WAKEUP_EN    264
-#define WNI_CFG_TELE_BCN_TRANS_LI    265
-#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS    266
-#define WNI_CFG_TELE_BCN_MAX_LI    267
-#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS    268
-#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS    269
-#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD    270
-#define WNI_CFG_ASSOC_STA_LIMIT    271
-#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL    272
-#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL    273
-#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND    274
-#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD    275
-#define WNI_CFG_ENABLE_CLOSE_LOOP    276
-#define WNI_CFG_ENABLE_LTE_COEX    277
-#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT    278
-#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT    279
-#define WNI_CFG_ENABLE_MC_ADDR_LIST    280
-#define WNI_CFG_ENABLE_UC_FILTER    281
-#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION    282
-#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED    283
-#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP    284
-#define WNI_CFG_AP_LINK_MONITOR_TIMEOUT    285
-#define WNI_CFG_TDLS_QOS_WMM_UAPSD_MASK    286
-#define WNI_CFG_TDLS_BUF_STA_ENABLED    287
-#define WNI_CFG_TDLS_PUAPSD_INACT_TIME    288
-#define WNI_CFG_TDLS_RX_FRAME_THRESHOLD    289
-#define WNI_CFG_PMF_SA_QUERY_MAX_RETRIES    290
-#define WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL    291
-#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN    292
-#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR    293
-#define WNI_CFG_ANTENNA_DIVESITY    294
-#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT    295
-#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY    296
-#define WNI_CFG_CURRENT_RSSI    297
-#define WNI_CFG_RTT3_ENABLE    298
-#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL    299
-#define WNI_CFG_TDLS_OFF_CHANNEL_ENABLED    300
-#define WNI_CFG_IBSS_ATIM_WIN_SIZE    301
-#define WNI_CFG_DFS_MASTER_ENABLED    302
-#define WNI_CFG_VHT_ENABLE_TXBF_20MHZ    303
-#define WNI_CFG_TDLS_WMM_MODE_ENABLED    304
+#define WNI_CFG_11G_ONLY_POLICY    99
+#define WNI_CFG_PACKET_CLASSIFICATION    100
+#define WNI_CFG_WME_ENABLED    101
+#define WNI_CFG_ADDTS_RSP_TIMEOUT    102
+#define WNI_CFG_MAX_SP_LENGTH    103
+#define WNI_CFG_SEND_SINGLE_SSID_ALWAYS    105
+#define WNI_CFG_WSM_ENABLED    106
+#define WNI_CFG_EDCA_PROFILE    107
+#define WNI_CFG_EDCA_ANI_ACBK_LOCAL    108
+#define WNI_CFG_EDCA_ANI_ACBE_LOCAL    109
+#define WNI_CFG_EDCA_ANI_ACVI_LOCAL    110
+#define WNI_CFG_EDCA_ANI_ACVO_LOCAL    111
+#define WNI_CFG_EDCA_ANI_ACBK    112
+#define WNI_CFG_EDCA_ANI_ACBE    113
+#define WNI_CFG_EDCA_ANI_ACVI    114
+#define WNI_CFG_EDCA_ANI_ACVO    115
+#define WNI_CFG_EDCA_WME_ACBK_LOCAL    116
+#define WNI_CFG_EDCA_WME_ACBE_LOCAL    117
+#define WNI_CFG_EDCA_WME_ACVI_LOCAL    118
+#define WNI_CFG_EDCA_WME_ACVO_LOCAL    119
+#define WNI_CFG_EDCA_WME_ACBK    120
+#define WNI_CFG_EDCA_WME_ACBE    121
+#define WNI_CFG_EDCA_WME_ACVI    122
+#define WNI_CFG_EDCA_WME_ACVO    123
+#define WNI_CFG_RDET_FLAG    124
+#define WNI_CFG_RADAR_CHANNEL_LIST    125
+#define WNI_CFG_LOCAL_POWER_CONSTRAINT    126
+#define WNI_CFG_ADMIT_POLICY    127
+#define WNI_CFG_ADMIT_BWFACTOR    128
+#define WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE    129
+#define WNI_CFG_CHANNEL_BONDING_MODE    130
+#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE    131
+#define WNI_CFG_DYNAMIC_THRESHOLD_ZERO    132
+#define WNI_CFG_DYNAMIC_THRESHOLD_ONE    133
+#define WNI_CFG_DYNAMIC_THRESHOLD_TWO    134
+#define WNI_CFG_TRIG_STA_BK_SCAN    135
+#define WNI_CFG_DYNAMIC_PROFILE_SWITCHING    136
+#define WNI_CFG_SCAN_CONTROL_LIST    137
+#define WNI_CFG_MIMO_ENABLED    138
+#define WNI_CFG_BLOCK_ACK_ENABLED    139
+#define WNI_CFG_BA_ACTIVITY_CHECK_TIMEOUT    140
+#define WNI_CFG_HT_RX_STBC    141
+#define WNI_CFG_HT_CAP_INFO    142
+#define WNI_CFG_HT_AMPDU_PARAMS    143
+#define WNI_CFG_SUPPORTED_MCS_SET    144
+#define WNI_CFG_EXT_HT_CAP_INFO    145
+#define WNI_CFG_TX_BF_CAP    146
+#define WNI_CFG_AS_CAP    147
+#define WNI_CFG_HT_INFO_FIELD1    148
+#define WNI_CFG_HT_INFO_FIELD2    149
+#define WNI_CFG_HT_INFO_FIELD3    150
+#define WNI_CFG_BASIC_MCS_SET    151
+#define WNI_CFG_CURRENT_MCS_SET    152
+#define WNI_CFG_GREENFIELD_CAPABILITY    153
+#define WNI_CFG_VHT_MAX_MPDU_LENGTH    154
+#define WNI_CFG_VHT_SUPPORTED_CHAN_WIDTH_SET    155
+#define WNI_CFG_VHT_LDPC_CODING_CAP    156
+#define WNI_CFG_VHT_SHORT_GI_80MHZ    157
+#define WNI_CFG_VHT_SHORT_GI_160_AND_80_PLUS_80MHZ    158
+#define WNI_CFG_VHT_TXSTBC    159
+#define WNI_CFG_VHT_RXSTBC    160
+#define WNI_CFG_VHT_SU_BEAMFORMER_CAP    161
+#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP    162
+#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED    163
+#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS    164
+#define WNI_CFG_VHT_MU_BEAMFORMER_CAP    165
+#define WNI_CFG_VHT_MU_BEAMFORMEE_CAP    166
+#define WNI_CFG_VHT_TXOP_PS    167
+#define WNI_CFG_VHT_HTC_VHTC_CAP    168
+#define WNI_CFG_VHT_AMPDU_LEN_EXPONENT    169
+#define WNI_CFG_VHT_LINK_ADAPTATION_CAP    170
+#define WNI_CFG_VHT_RX_ANT_PATTERN    171
+#define WNI_CFG_VHT_TX_ANT_PATTERN    172
+#define WNI_CFG_VHT_RX_MCS_MAP    173
+#define WNI_CFG_VHT_TX_MCS_MAP    174
+#define WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE    175
+#define WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE    176
+#define WNI_CFG_VHT_CHANNEL_WIDTH    177
+#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1    178
+#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2    179
+#define WNI_CFG_VHT_BASIC_MCS_SET    180
+#define WNI_CFG_VHT_MU_MIMO_CAP_STA_COUNT    181
+#define WNI_CFG_VHT_SS_UNDER_UTIL    182
+#define WNI_CFG_VHT_40MHZ_UTILIZATION    183
+#define WNI_CFG_VHT_80MHZ_UTILIZATION    184
+#define WNI_CFG_VHT_160MHZ_UTILIZATION    185
+#define WNI_CFG_MAX_AMSDU_LENGTH    186
+#define WNI_CFG_MPDU_DENSITY    187
+#define WNI_CFG_NUM_BUFF_ADVERT    188
+#define WNI_CFG_MAX_RX_AMPDU_FACTOR    189
+#define WNI_CFG_SHORT_GI_20MHZ    190
+#define WNI_CFG_SHORT_GI_40MHZ    191
+#define WNI_CFG_RIFS_ENABLED    192
+#define WNI_CFG_MAX_PS_POLL    193
+#define WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE    194
+#define WNI_CFG_RSSI_FILTER_PERIOD    195
+#define WNI_CFG_MIN_RSSI_THRESHOLD    196
+#define WNI_CFG_NTH_BEACON_FILTER    197
+#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE    198
+#define WNI_CFG_SCAN_IN_POWERSAVE    199
+#define WNI_CFG_IGNORE_DTIM    200
+#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE    201
+#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE    202
+#define WNI_CFG_WOWLAN_DEAUTH_ENABLE    203
+#define WNI_CFG_WOWLAN_DISASSOC_ENABLE    204
+#define WNI_CFG_WOWLAN_MAX_MISSED_BEACON    205
+#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD    206
+#define WNI_CFG_BA_TIMEOUT    207
+#define WNI_CFG_BA_THRESHOLD_HIGH    208
+#define WNI_CFG_MAX_BA_BUFFERS    209
+#define WNI_CFG_MAX_BA_SESSIONS    210
+#define WNI_CFG_BA_AUTO_SETUP    211
+#define WNI_CFG_ADDBA_REQ_DECLINE    212
+#define WNI_CFG_DEL_ALL_RX_BA_SESSIONS_2_4_G_BTC    213
+#define WNI_CFG_BG_SCAN_CHANNEL_LIST    214
+#define WNI_CFG_MAX_MEDIUM_TIME    215
+#define WNI_CFG_MAX_MPDUS_IN_AMPDU    216
+#define WNI_CFG_IBSS_AUTO_BSSID    217
+#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG    218
+#define WNI_CFG_PROBE_REQ_ADDNIE_DATA    219
+#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG    220
+#define WNI_CFG_PROBE_RSP_ADDNIE_DATA1    221
+#define WNI_CFG_PROBE_RSP_ADDNIE_DATA2    222
+#define WNI_CFG_PROBE_RSP_ADDNIE_DATA3    223
+#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG    224
+#define WNI_CFG_ASSOC_RSP_ADDNIE_DATA    225
+#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG    226
+#define WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA    227
+#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG    228
+#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA    229
+#define WNI_CFG_WPS_ENABLE    230
+#define WNI_CFG_WPS_STATE    231
+#define WNI_CFG_WPS_PROBE_REQ_FLAG    232
+#define WNI_CFG_WPS_VERSION    233
+#define WNI_CFG_WPS_REQUEST_TYPE    234
+#define WNI_CFG_WPS_CFG_METHOD    235
+#define WNI_CFG_WPS_UUID    236
+#define WNI_CFG_WPS_PRIMARY_DEVICE_CATEGORY    237
+#define WNI_CFG_WPS_PIMARY_DEVICE_OUI    238
+#define WNI_CFG_WPS_DEVICE_SUB_CATEGORY    239
+#define WNI_CFG_WPS_ASSOCIATION_STATE    240
+#define WNI_CFG_WPS_CONFIGURATION_ERROR    241
+#define WNI_CFG_WPS_DEVICE_PASSWORD_ID    242
+#define WNI_CFG_WPS_ASSOC_METHOD    243
+#define WNI_CFG_LOW_GAIN_OVERRIDE    244
+#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE    245
+#define WNI_CFG_RPE_POLLING_THRESHOLD    246
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG    247
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG    248
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG    249
+#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG    250
+#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS    251
+#define WNI_CFG_SINGLE_TID_RC    252
+#define WNI_CFG_RRM_ENABLED    253
+#define WNI_CFG_RRM_OPERATING_CHAN_MAX    254
+#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX    255
+#define WNI_CFG_TX_PWR_CTRL_ENABLE    256
+#define WNI_CFG_MCAST_BCAST_FILTER_SETTING    257
+#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK    258
+#define WNI_CFG_DYNAMIC_PS_POLL_VALUE    259
+#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT    260
+#define WNI_CFG_TELE_BCN_WAKEUP_EN    261
+#define WNI_CFG_TELE_BCN_TRANS_LI    262
+#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS    263
+#define WNI_CFG_TELE_BCN_MAX_LI    264
+#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS    265
+#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS    266
+#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD    267
+#define WNI_CFG_ASSOC_STA_LIMIT    268
+#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL    269
+#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL    270
+#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND    271
+#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD    272
+#define WNI_CFG_ENABLE_CLOSE_LOOP    273
+#define WNI_CFG_ENABLE_LTE_COEX    274
+#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT    275
+#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT    276
+#define WNI_CFG_ENABLE_MC_ADDR_LIST    277
+#define WNI_CFG_ENABLE_UC_FILTER    278
+#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION    279
+#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED    280
+#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP    281
+#define WNI_CFG_AP_LINK_MONITOR_TIMEOUT    282
+#define WNI_CFG_TDLS_QOS_WMM_UAPSD_MASK    283
+#define WNI_CFG_TDLS_BUF_STA_ENABLED    284
+#define WNI_CFG_TDLS_PUAPSD_INACT_TIME    285
+#define WNI_CFG_TDLS_RX_FRAME_THRESHOLD    286
+#define WNI_CFG_PMF_SA_QUERY_MAX_RETRIES    287
+#define WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL    288
+#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN    289
+#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR    290
+#define WNI_CFG_ANTENNA_DIVESITY    291
+#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT    292
+#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY    293
+#define WNI_CFG_CURRENT_RSSI    294
+#define WNI_CFG_RTT3_ENABLE    295
+#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL    296
+#define WNI_CFG_TDLS_OFF_CHANNEL_ENABLED    297
+#define WNI_CFG_IBSS_ATIM_WIN_SIZE    298
+#define WNI_CFG_DFS_MASTER_ENABLED    299
+#define WNI_CFG_VHT_ENABLE_TXBF_20MHZ    300
+#define WNI_CFG_TDLS_WMM_MODE_ENABLED    301
 
 /*
  * String parameter lengths
@@ -811,21 +808,6 @@
 #define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED_STAMAX    1
 #define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED_STADEF    1
 
-#define WNI_CFG_CAL_PERIOD_STAMIN    2
-#define WNI_CFG_CAL_PERIOD_STAMAX    10
-#define WNI_CFG_CAL_PERIOD_STADEF    5
-
-#define WNI_CFG_STATS_PERIOD_STAMIN    1
-#define WNI_CFG_STATS_PERIOD_STAMAX    10
-#define WNI_CFG_STATS_PERIOD_STADEF    10
-
-#define WNI_CFG_CAL_CONTROL_STAMIN    0
-#define WNI_CFG_CAL_CONTROL_STAMAX    1
-#define WNI_CFG_CAL_CONTROL_STADEF    0
-
-#define WNI_CFG_CAL_CONTROL_CAL_ON    0
-#define WNI_CFG_CAL_CONTROL_CAL_OFF    1
-
 #define WNI_CFG_11G_ONLY_POLICY_STAMIN    0
 #define WNI_CFG_11G_ONLY_POLICY_STAMAX    1
 #define WNI_CFG_11G_ONLY_POLICY_STADEF    0
@@ -1647,8 +1629,8 @@
 #define WNI_CFG_TDLS_WMM_MODE_ENABLED_STAMAX    1
 #define WNI_CFG_TDLS_WMM_MODE_ENABLED_STADEF    0
 
-#define CFG_PARAM_MAX_NUM        305
-#define CFG_STA_IBUF_MAX_SIZE    248
+#define CFG_PARAM_MAX_NUM        302
+#define CFG_STA_IBUF_MAX_SIZE    245
 #define CFG_STA_SBUF_MAX_SIZE    3204
 #define CFG_SEM_MAX_NUM          19
 
diff --git a/CORE/MAC/src/cfg/cfgParamName.c b/CORE/MAC/src/cfg/cfgParamName.c
index 07f3eb2b1bac..f2df54750757 100644
--- a/CORE/MAC/src/cfg/cfgParamName.c
+++ b/CORE/MAC/src/cfg/cfgParamName.c
@@ -134,9 +134,6 @@ unsigned char *gCfgParamName[] = {
     (unsigned char *)"FORCE_POLICY_PROTECTION",
     (unsigned char *)"11G_SHORT_PREAMBLE_ENABLED",
     (unsigned char *)"11G_SHORT_SLOT_TIME_ENABLED",
-    (unsigned char *)"CAL_PERIOD",
-    (unsigned char *)"STATS_PERIOD",
-    (unsigned char *)"CAL_CONTROL",
     (unsigned char *)"11G_ONLY_POLICY",
     (unsigned char *)"PACKET_CLASSIFICATION",
     (unsigned char *)"WME_ENABLED",
diff --git a/CORE/MAC/src/cfg/cfgUtil/cfg.txt b/CORE/MAC/src/cfg/cfgUtil/cfg.txt
index 0b49d79ce106..131f66345d79 100644
--- a/CORE/MAC/src/cfg/cfgUtil/cfg.txt
+++ b/CORE/MAC/src/cfg/cfgUtil/cfg.txt
@@ -1538,46 +1538,6 @@ NONE
 0    1    1
 
 *
-* Calibration periodicity (minutes)
-*
-
-WNI_CFG_CAL_PERIOD    I    4    12
-V    RW    NP
-HAL
-2    10    5
-V    RW    NP
-HAL
-2    10    5
-
-*
-* Statistics collection periodicity (seconds)
-*
-
-WNI_CFG_STATS_PERIOD    I    4    12
-V    RW    NP
-HAL
-1    10    10
-V    RW    NP
-HAL
-1    10    10
-
-*
-* Calibration on/off control
-*
-
-WNI_CFG_CAL_CONTROL    I    4    12
-V    RW    NP
-HAL
-0    1    0
-V    RW    NP
-HAL
-0    1    0
-
-#ENUM CAL_ON  0
-#ENUM CAL_OFF 1
-
-
-*
 * Parameter to allow 11g only STAs while operating in 11g mode
 *
 
diff --git a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
index d6f42cbc0b38..cb6a21363066 100644
--- a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
@@ -246,6 +246,7 @@ limProcessAssocReqFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,
     tPmfSaQueryTimerId timerId;
     tANI_U32 retryInterval;
 #endif
+    tANI_U16 assocId = 0;
 
     limGetPhyMode(pMac, &phyMode, psessionEntry);
 
@@ -260,8 +261,6 @@ limProcessAssocReqFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,
           psessionEntry->peSessionId, psessionEntry->limSystemRole,
           psessionEntry->limMlmState, MAC_ADDR_ARRAY(pHdr->sa));
 
-   lim_check_sta_in_pe_entries(pMac, pHdr);
-
    if (psessionEntry->limSystemRole == eLIM_STA_ROLE || psessionEntry->limSystemRole == eLIM_BT_AMP_STA_ROLE )
    {
         limLog(pMac, LOGE, FL("received unexpected ASSOC REQ on sessionid: %d "
@@ -273,6 +272,30 @@ limProcessAssocReqFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,
         return;
     }
 
+    /*
+     * If a STA is already present in DPH and it
+     * is initiating a Assoc re-transmit, do not
+     * process it. This can happen when first Assoc Req frame
+     * is received but ACK lost at STA side. The ACK for this
+     * dropped Assoc Req frame should be sent by HW. Host simply
+     * does not process it once the entry for the STA is already
+     * present in DPH.
+     */
+    pStaDs = dphLookupHashEntry(pMac, pHdr->sa, &assocId,
+                            &psessionEntry->dph.dphHashTable);
+    if ((NULL != pStaDs) && (pHdr->fc.retry > 0))
+    {
+        limLog(pMac, LOGE,
+           FL("STA is initiating Assoc Req after ACK lost.So, do not Process"
+           "sessionid: %d sys subType=%d for role=%d from: "MAC_ADDRESS_STR),
+           psessionEntry->peSessionId,
+           subType, psessionEntry->limSystemRole, MAC_ADDR_ARRAY(pHdr->sa));
+
+        return;
+    }
+
+    lim_check_sta_in_pe_entries(pMac, pHdr);
+
     // Get pointer to Re/Association Request frame body
     pBody = WDA_GET_RX_MPDU_DATA(pRxPacketInfo);
 
diff --git a/CORE/SERVICES/HIF/common/hif_bmi_reg_access.c b/CORE/SERVICES/HIF/common/hif_bmi_reg_access.c
index 8880fcf02803..191846f19921 100644
--- a/CORE/SERVICES/HIF/common/hif_bmi_reg_access.c
+++ b/CORE/SERVICES/HIF/common/hif_bmi_reg_access.c
@@ -289,8 +289,13 @@ A_STATUS HIFRegBasedGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *ta
 
     status = bmiBufferSend(device, (A_UCHAR *)&cid, sizeof(cid));
     if (status != A_OK) {
-        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-        return A_ERROR;
+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device, try again.\n"));
+        mdelay(100);
+        status = bmiBufferSend(device, (A_UCHAR *)&cid, sizeof(cid));
+        if (status != A_OK) {
+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Still unable to write to the device!\n"));
+            return A_ERROR;
+        }
     }
 
     status = bmiBufferReceive(device, (A_UCHAR *)&targ_info->target_ver,
diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h
index 98da6500b1c3..ea45bc695c9b 100644
--- a/CORE/SME/inc/csrInternal.h
+++ b/CORE/SME/inc/csrInternal.h
@@ -1023,7 +1023,6 @@ typedef struct tagCsrRoamStruct
     eCsrRoamLinkQualityInd vccLinkQuality;
     tCsrLinkQualityIndInfo linkQualityIndInfo;
     v_CONTEXT_t gVosContext; //used for interaction with TL
-    v_U8_t ucACWeights[WLANTL_MAX_AC];
     /* TODO : Upto here */
     tCsrTimerInfo WaitForKeyTimerInfo;
     tCsrRoamSession   *roamSession;
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 99aba1c39709..1495e064249e 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -85,11 +85,7 @@
 #define CSR_MIN_GLOBAL_STAT_QUERY_PERIOD   500 //ms
 #define CSR_MIN_GLOBAL_STAT_QUERY_PERIOD_IN_BMPS 2000 //ms
 #define CSR_MIN_TL_STAT_QUERY_PERIOD       500 //ms
-//We use constant 4 here
-//This macro returns true when higher AC parameter is bigger than lower AC for a difference
-//The bigger the number, the less chance of TX
-//It must put lower AC as the first parameter.
-#define SME_DETECT_AC_WEIGHT_DIFF(loAC, hiAC)   (v_BOOL_t)(((hiAC) > (loAC)) ? (((hiAC)-(loAC)) > 4) : 0)
+
 //Flag to send/do not send disassoc frame over the air
 #define CSR_DONT_SEND_DISASSOC_OVER_THE_AIR 1
 #define RSSI_HACK_BMPS (-40)
@@ -681,8 +677,6 @@ eHalStatus csrReady(tpAniSirGlobal pMac)
     {
        csrScanStartResultCfgAgingTimer(pMac);
     }
-    //Store the AC weights in TL for later use
-    WLANTL_GetACWeights(pMac->roam.gVosContext, pMac->roam.ucACWeights);
     status = csrInitChannelList( pMac );
     if ( ! HAL_STATUS_SUCCESS( status ) )
     {
@@ -2805,14 +2799,6 @@ eHalStatus csrRoamIssueDisassociate( tpAniSirGlobal pMac, tANI_U32 sessionId,
         return eHAL_STATUS_FAILURE;
     }
 
-    //Restore AC weight in case we change it
-    if ( csrIsConnStateConnectedInfra( pMac, sessionId ) )
-    {
-        smsLog(pMac, LOG1, FL(" restore AC weights (%d-%d-%d-%d)"), pMac->roam.ucACWeights[0], pMac->roam.ucACWeights[1],
-            pMac->roam.ucACWeights[2], pMac->roam.ucACWeights[3]);
-        WLANTL_SetACWeights(pMac->roam.gVosContext, pMac->roam.ucACWeights);
-    }
-
     if ( fMICFailure )
     {
         reasonCode = eSIR_MAC_MIC_FAILURE_REASON;
@@ -5323,64 +5309,6 @@ static eHalStatus csrRoamSaveSecurityRspIE(tpAniSirGlobal pMac, tANI_U32 session
     return (status);
 }
 
-static void csrCheckAndUpdateACWeight( tpAniSirGlobal pMac, tDot11fBeaconIEs *pIEs )
-{
-    v_U8_t bACWeights[WLANTL_MAX_AC];
-    v_U8_t paramBk, paramBe, paramVi, paramVo;
-    v_BOOL_t fWeightChange = VOS_FALSE;
-    //Compare two ACs' EDCA parameters, from low to high (BK, BE, VI, VO)
-    //The "formula" is, if lower AC's AIFSN+CWMin is bigger than a fixed amount
-    //of the higher AC one, make the higher AC has the same weight as the lower AC.
-    //This doesn't address the case where the lower AC needs a real higher weight
-    if( pIEs->WMMParams.present )
-    {
-        //no change to the lowest ones
-        bACWeights[WLANTL_AC_BK] = pMac->roam.ucACWeights[WLANTL_AC_BK];
-        bACWeights[WLANTL_AC_BE] = pMac->roam.ucACWeights[WLANTL_AC_BE];
-        bACWeights[WLANTL_AC_VI] = pMac->roam.ucACWeights[WLANTL_AC_VI];
-        bACWeights[WLANTL_AC_VO] = pMac->roam.ucACWeights[WLANTL_AC_VO];
-        paramBk = pIEs->WMMParams.acbk_aifsn + pIEs->WMMParams.acbk_acwmin;
-        paramBe = pIEs->WMMParams.acbe_aifsn + pIEs->WMMParams.acbe_acwmin;
-        paramVi = pIEs->WMMParams.acvi_aifsn + pIEs->WMMParams.acvi_acwmin;
-        paramVo = pIEs->WMMParams.acvo_aifsn + pIEs->WMMParams.acvo_acwmin;
-        if( SME_DETECT_AC_WEIGHT_DIFF(paramBk, paramBe) )
-        {
-            bACWeights[WLANTL_AC_BE] = bACWeights[WLANTL_AC_BK];
-            fWeightChange = VOS_TRUE;
-        }
-        if( SME_DETECT_AC_WEIGHT_DIFF(paramBk, paramVi) )
-        {
-            bACWeights[WLANTL_AC_VI] = bACWeights[WLANTL_AC_BK];
-            fWeightChange = VOS_TRUE;
-        }
-        else if( SME_DETECT_AC_WEIGHT_DIFF(paramBe, paramVi) )
-        {
-            bACWeights[WLANTL_AC_VI] = bACWeights[WLANTL_AC_BE];
-            fWeightChange = VOS_TRUE;
-        }
-        if( SME_DETECT_AC_WEIGHT_DIFF(paramBk, paramVo) )
-        {
-            bACWeights[WLANTL_AC_VO] = bACWeights[WLANTL_AC_BK];
-            fWeightChange = VOS_TRUE;
-        }
-        else if( SME_DETECT_AC_WEIGHT_DIFF(paramBe, paramVo) )
-        {
-            bACWeights[WLANTL_AC_VO] = bACWeights[WLANTL_AC_BE];
-            fWeightChange = VOS_TRUE;
-        }
-        else if( SME_DETECT_AC_WEIGHT_DIFF(paramVi, paramVo) )
-        {
-            bACWeights[WLANTL_AC_VO] = bACWeights[WLANTL_AC_VI];
-            fWeightChange = VOS_TRUE;
-        }
-        if(fWeightChange)
-        {
-            smsLog(pMac, LOGE, FL(" change AC weights (%d-%d-%d-%d)"), bACWeights[0], bACWeights[1],
-                bACWeights[2], bACWeights[3]);
-            WLANTL_SetACWeights(pMac->roam.gVosContext, bACWeights);
-        }
-    }
-}
 #ifdef WLAN_FEATURE_VOWIFI_11R
 //Returns whether the current association is a 11r assoc or not
 tANI_BOOLEAN csrRoamIs11rAssoc(tpAniSirGlobal pMac, tANI_U8 sessionId)
@@ -5899,18 +5827,6 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman
                 csrRoamCompletion(pMac, sessionId, NULL, pCommand, eCSR_ROAM_RESULT_NONE, eANI_BOOLEAN_TRUE);
                 // reset the PMKID candidate list
                 csrResetPMKIDCandidateList( pMac, sessionId );
-                //Update TL's AC weight base on the current EDCA parameters
-                /*
-                 * These parameters may change in the course of the connection,
-                 * that situation is not taken care here. This change is mainly
-                 * to address a WIFI WMM test where BE has a equal or
-                 * higher TX priority than VI.
-                 * We only do this for infra link
-                 */
-                if( csrIsConnStateConnectedInfra(pMac, sessionId ) && pIes )
-                {
-                    csrCheckAndUpdateACWeight(pMac, pIes);
-                }
 #ifdef FEATURE_WLAN_WAPI
                 // reset the BKID candidate list
                 csrResetBKIDCandidateList( pMac, sessionId );
@@ -7356,10 +7272,6 @@ eHalStatus csrRoamProcessDisassocDeauth( tpAniSirGlobal pMac, tSmeCmd *pCommand,
     }
     else if ( csrIsConnStateInfra( pMac, sessionId ) )
     {
-        smsLog(pMac, LOG1, FL(" restore AC weights (%d-%d-%d-%d)"), pMac->roam.ucACWeights[0], pMac->roam.ucACWeights[1],
-            pMac->roam.ucACWeights[2], pMac->roam.ucACWeights[3]);
-        //Restore AC weight in case we change it
-        WLANTL_SetACWeights(pMac->roam.gVosContext, pMac->roam.ucACWeights);
         /* In Infrastructure, we need to disassociate from the
            Infrastructure network... */
         NewSubstate = eCSR_ROAM_SUBSTATE_DISASSOC_FORCED;
diff --git a/CORE/TL/inc/wlan_qct_tl.h b/CORE/TL/inc/wlan_qct_tl.h
index 2a41929a79db..277d1ae982e5 100644
--- a/CORE/TL/inc/wlan_qct_tl.h
+++ b/CORE/TL/inc/wlan_qct_tl.h
@@ -2276,45 +2276,6 @@ WLANTL_GetReplayCounterFromRxBD
 );
 
 
-
-/*
- DESCRIPTION
-    TL returns the weight currently maintained in TL.
- IN
-    pvosGCtx:       pointer to the global vos context; a handle to TL's
-                    or SME's control block can be extracted from its context
-
- OUT
-    pACWeights:     Caller allocated memory for filling in weights
-
- RETURN VALUE  VOS_STATUS
-*/
-VOS_STATUS
-WLANTL_GetACWeights
-(
-  v_PVOID_t             pvosGCtx,
-  v_U8_t*               pACWeights
-);
-
-
-/*
- DESCRIPTION
-    Change the weight currently maintained by TL.
- IN
-    pvosGCtx:       pointer to the global vos context; a handle to TL's
-                    or SME's control block can be extracted from its context
-    pACWeights:     Caller allocated memory contain the weights to use
-
-
- RETURN VALUE  VOS_STATUS
-*/
-VOS_STATUS
-WLANTL_SetACWeights
-(
-  v_PVOID_t             pvosGCtx,
-  v_U8_t*               pACWeights
-);
-
 /*==========================================================================
   FUNCTION      WLANTL_GetSoftAPStatistics
 
diff --git a/CORE/VOSS/inc/i_vos_packet.h b/CORE/VOSS/inc/i_vos_packet.h
index 11d4afa018b6..72504c3d43f2 100644
--- a/CORE/VOSS/inc/i_vos_packet.h
+++ b/CORE/VOSS/inc/i_vos_packet.h
@@ -76,8 +76,4 @@ struct vos_pkt_t
    void *pkt_buf;
 };
 
-// the number of Receive vos packets used exclusively for vos packet
-// allocations of type VOS_PKT_TYPE_RX_RAW
-#define VPKT_NUM_RX_RAW_PACKETS (1024)
-
 #endif  // !defined( __I_VOS_PACKET_H )
diff --git a/CORE/VOSS/src/vos_sched.h b/CORE/VOSS/src/vos_sched.h
index a67aef2f1a59..169730aa4148 100644
--- a/CORE/VOSS/src/vos_sched.h
+++ b/CORE/VOSS/src/vos_sched.h
@@ -67,7 +67,6 @@
   ------------------------------------------------------------------------*/
 #include <vos_event.h>
 #include "i_vos_types.h"
-#include "i_vos_packet.h"
 #include <linux/wait.h>
 #if defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK)
 #include <linux/wakelock.h>
@@ -99,8 +98,10 @@
 ** worst-case scenario.  Must be able to handle all
 ** incoming frames, as well as overhead for internal
 ** messaging
+**
+** Increased to 2000 to handle more RX frames
 */
-#define VOS_CORE_MAX_MESSAGES           (VPKT_NUM_RX_RAW_PACKETS + 32)
+#define VOS_CORE_MAX_MESSAGES 2000
 
 #ifdef QCA_CONFIG_SMP
 /*
diff --git a/firmware_bin/WCNSS_cfg.dat b/firmware_bin/WCNSS_cfg.dat
index ec818c3fd5b3..328912272d65 100644
--- a/firmware_bin/WCNSS_cfg.dat
+++ b/firmware_bin/WCNSS_cfg.dat
diff --git a/tools/fwdebuglog/cld-diag-parser.c b/tools/fwdebuglog/cld-diag-parser.c
index de418397658a..3f3f45dd1a73 100644
--- a/tools/fwdebuglog/cld-diag-parser.c
+++ b/tools/fwdebuglog/cld-diag-parser.c
@@ -837,6 +837,8 @@ process_diaghost_msg(uint8_t *datap, uint16_t len)
 {
     uint8_t  *payload;
     event_report_t *pEvent_report =(event_report_t *)datap ;
+    if (!pEvent_report)
+        return;
     debug_printf("\n  %s diag_type = %d event_id =%d\n",
                  __func__, pEvent_report->diag_type,
                  pEvent_report->event_id);
@@ -876,7 +878,7 @@ process_diagfw_msg(uint8_t *datap, uint16_t len, uint32_t optionflag,
         memset(dump_buffer, 0, sizeof(dump_buffer));
         debug_printf("process_diagfw_msg hex dump start len %d", len);
         for (i = 0; i < len; i++) {
-             ret = snprintf(dump_buffer + j,BUF_SIZ, "0x%x ", debugp[i]);
+             ret = snprintf(dump_buffer + j, BUF_SIZ - j, "0x%x ", debugp[i]);
              j += ret;
              if (!(i % 16) && (i!=0)) {
                 total_dump_len += 16;
@@ -977,9 +979,11 @@ process_diagfw_msg(uint8_t *datap, uint16_t len, uint32_t optionflag,
             }
             entry = diag_find_by_id(id);
             if (entry) {
-               debug_printf(" entry->format = %s pack = %s\n",
+                if (entry->format && entry->pack) {
+                    debug_printf("entry->format = %s pack = %s\n",
                                     entry->format, entry->pack);
-               if ((payloadlen > 0) && entry->pack) {
+                }
+                if ((payloadlen > 0) && entry->pack) {
                     if (payloadlen < BUF_SIZ)
                         memcpy(payload_buf, payload, payloadlen);
                     else
@@ -1001,29 +1005,29 @@ process_diagfw_msg(uint8_t *datap, uint16_t len, uint32_t optionflag,
                              (uint8_t*)entry->msg,
                              entry->msg_len
                               );
-               }
-               else
-                  strlcpy(buf, entry->format, strlen(entry->format));
-
-               debug_printf("\n buf = %s \n", buf);
-               if (optionflag & LOGFILE_FLAG)  {
-                   lrecord = *record;
-                   lrecord++;
-                   if (!((optionflag & SILENT_FLAG) == SILENT_FLAG))
-                             printf("%d: %s\n", lrecord, buf);
-
-                   res = diag_printf(
+                }
+                else if (entry->format)
+                    strlcpy(buf, entry->format, strlen(entry->format));
+
+                debug_printf("\n buf = %s \n", buf);
+                if (optionflag & LOGFILE_FLAG)  {
+                    lrecord = *record;
+                    lrecord++;
+                    if (!((optionflag & SILENT_FLAG) == SILENT_FLAG))
+                        printf("%d: %s\n", lrecord, buf);
+
+                    res = diag_printf(
                          buf, vdevid, vdevlevel, optionflag, timestamp, log_out
                               );
-                   //fseek(log_out, lrecord * res, SEEK_SET);
-                   if (lrecord == max_records) {
-                       lrecord = 0;
-                       fseek(log_out, lrecord * res, SEEK_SET);
-                   }
-                   *record = lrecord;
-               }
-               if (optionflag & (CONSOLE_FLAG | QXDM_FLAG))
-                   diag_printf(
+                    //fseek(log_out, lrecord * res, SEEK_SET);
+                    if (lrecord == max_records) {
+                        lrecord = 0;
+                        fseek(log_out, lrecord * res, SEEK_SET);
+                    }
+                    *record = lrecord;
+                }
+                if (optionflag & (CONSOLE_FLAG | QXDM_FLAG))
+                    diag_printf(
                          buf, vdevid, vdevlevel, optionflag, timestamp, NULL
                               );
             }
diff --git a/tools/fwdebuglog/cld-diag-parser.h b/tools/fwdebuglog/cld-diag-parser.h
index 1c3dcdaa2eb9..9cb742a2c1be 100644
--- a/tools/fwdebuglog/cld-diag-parser.h
+++ b/tools/fwdebuglog/cld-diag-parser.h
@@ -133,7 +133,7 @@
 #define CONSOLE_FLAG           0x02
 #define QXDM_FLAG              0x04
 #define SILENT_FLAG            0x08
-#define DEBUG_FLAG             0x0A
+#define DEBUG_FLAG             0x10
 
 #define ATH6KL_FWLOG_PAYLOAD_SIZE              1500
 
@@ -261,11 +261,6 @@ static inline unsigned int aniNlAlign(unsigned int len)
     return ((len + ANI_NL_MASK) & ~ANI_NL_MASK);
 }
 
-static inline void *aniNlAlignBuf(void *buf)
-{
-    return (void *)aniNlAlign((unsigned int)buf);
-}
-
 /*
  * Determines the aligned length of the WNI MSG including the hdr
  * for a given payload of length 'len'.
@@ -275,7 +270,7 @@ static inline unsigned int aniNlLen(unsigned int len)
     return  (aniNlAlign(sizeof(tAniHdr)) + len);
 }
 
-/* KENEL DEFS END */
+/* KERNEL DEFS END */
 
 #define WLAN_NL_MSG_CNSS_DIAG   27 /* Msg type between user space/wlan driver */
 #define WLAN_NL_MSG_CNSS_HOST_MSG    28