Merge "Merge remote-tracking branch 'origin/caf/caf-wlan/master'"

121 files changed, 1878 insertions, 1700 deletions

diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 9dd34731fdfc..957333f86ced 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -1425,4 +1425,6 @@ void hdd_deinit_batch_scan(hdd_adapter_t *pAdapter);
 
 #endif /*End of FEATURE_WLAN_BATCH_SCAN*/
 
+void wlan_hdd_send_svc_nlink_msg(int type);
+
 #endif    // end #if !defined( WLAN_HDD_MAIN_H )
diff --git a/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h b/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h
index 5c8a8d7b1774..cdce12535c64 100644
--- a/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h
+++ b/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h
@@ -235,6 +235,22 @@ extern VOS_STATUS hdd_softap_rx_packet_cbk( v_VOID_t *vosContext,
 extern VOS_STATUS hdd_softap_rx_packet_cbk(v_VOID_t *vosContext,
                                            adf_nbuf_t rxBufChain,
                                            v_U8_t staId);
+#ifdef IPA_OFFLOAD
+/**============================================================================
+  @brief hdd_softap_rx_mul_packet_cbk() - Receive callback registered with TL.
+  IPA integrated platform, TL Shim will give multiple RX frames with NETBUF
+  link. Linked frames should be un-link and send to NETDEV.
+
+  @param vosContext      : [in] pointer to VOS context
+  @param rx_buf_list     : [in] pointer to rx adf_nbuf linked list
+  @param staId           : [in] Station Id (Adress 1 Index)
+
+  @return                : VOS_STATUS_E_FAILURE if any errors encountered,
+                         : VOS_STATUS_SUCCESS otherwise
+  ===========================================================================*/
+VOS_STATUS hdd_softap_rx_mul_packet_cbk(v_VOID_t *vosContext,
+                                    adf_nbuf_t rx_buf_list, v_U8_t staId);
+#endif /* IPA_OFFLOAD */
 #endif
 
 /**============================================================================
diff --git a/CORE/HDD/inc/wlan_hdd_tx_rx.h b/CORE/HDD/inc/wlan_hdd_tx_rx.h
index ecbcee68ffbd..b500edd258b1 100644
--- a/CORE/HDD/inc/wlan_hdd_tx_rx.h
+++ b/CORE/HDD/inc/wlan_hdd_tx_rx.h
@@ -230,6 +230,23 @@ extern VOS_STATUS hdd_rx_packet_cbk( v_VOID_t *vosContext,
   ===========================================================================*/
 extern VOS_STATUS hdd_rx_packet_cbk(v_VOID_t *vosContext, adf_nbuf_t rxBufChain,
                                     v_U8_t staId);
+
+#ifdef IPA_OFFLOAD
+/**============================================================================
+  @brief hdd_rx_mul_packet_cbk() - Receive callback registered with TL.
+  IPA integrated platform, TL Shim will give multiple RX frames with NETBUF
+  link. Linked frames should be un-link and send to NETDEV.
+
+  @param vosContext      : [in] pointer to VOS context
+  @param rx_buf_list     : [in] pointer to rx adf_nbuf linked list
+  @param staId           : [in] Station Id (Adress 1 Index)
+
+  @return                : VOS_STATUS_E_FAILURE if any errors encountered,
+                         : VOS_STATUS_SUCCESS otherwise
+  ===========================================================================*/
+VOS_STATUS hdd_rx_mul_packet_cbk(v_VOID_t *vosContext,
+                                    adf_nbuf_t rx_buf_list, v_U8_t staId);
+#endif /* IPA_OFFLOAD */
 #endif
 
 /**============================================================================
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index e9f9757b17e6..aaa68744e1d0 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -1089,14 +1089,18 @@ static VOS_STATUS hdd_roamRegisterSTA( hdd_adapter_t *pAdapter,
                                          hdd_tx_fetch_packet_cbk, &staDesc,
                                          pBssDesc->rssi );
    } else {
-#endif
+      vosStatus = WLANTL_RegisterSTAClient( pHddCtx->pvosContext,
+                                         hdd_rx_mul_packet_cbk,
+                                         hdd_tx_complete_cbk,
+                                         hdd_tx_fetch_packet_cbk, &staDesc,
+                                         pBssDesc->rssi );
+   }
+#else
    vosStatus = WLANTL_RegisterSTAClient( pHddCtx->pvosContext,
                                          hdd_rx_packet_cbk,
                                          hdd_tx_complete_cbk,
                                          hdd_tx_fetch_packet_cbk, &staDesc,
                                          pBssDesc->rssi );
-#ifdef IPA_OFFLOAD
-   }
 #endif
 
    if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) )
@@ -2218,13 +2222,16 @@ VOS_STATUS hdd_roamRegisterTDLSSTA( hdd_adapter_t *pAdapter,
                                           hdd_tx_complete_cbk,
                                           hdd_tx_fetch_packet_cbk, &staDesc, 0 );
     } else {
-#endif
+       vosStatus = WLANTL_RegisterSTAClient( pHddCtx->pvosContext,
+                                          hdd_rx_mul_packet_cbk,
+                                          hdd_tx_complete_cbk,
+                                          hdd_tx_fetch_packet_cbk, &staDesc, 0 );
+   }
+#else
     vosStatus = WLANTL_RegisterSTAClient( pVosContext,
                                           hdd_rx_packet_cbk,
                                           hdd_tx_complete_cbk,
                                           hdd_tx_fetch_packet_cbk, &staDesc, 0 );
-#ifdef IPA_OFFLOAD
-	}
 #endif
 
     if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) )
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 819deb123dc0..381ff6ec3d1f 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -3669,10 +3669,10 @@ VOS_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx)
 
    if (status)
    {
-      hddLog(VOS_TRACE_LEVEL_FATAL, "%s: request_firmware failed %d\n",
+      hddLog(VOS_TRACE_LEVEL_WARN, "%s: request_firmware failed %d\n",
              __func__, status);
       vos_status = VOS_STATUS_E_FAILURE;
-      goto config_exit;
+      return vos_status;
    }
    if (!fw || !fw->data || !fw->size)
    {
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 761d1fb23942..1e8406021d2e 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -8289,7 +8289,6 @@ void hdd_cfg80211_sched_scan_done_callback(void *callbackContext,
     int ret;
     hdd_adapter_t* pAdapter = (hdd_adapter_t*)callbackContext;
     hdd_context_t *pHddCtx;
-    hdd_scaninfo_t *pScanInfo = &pAdapter->scan_info;
 
     if (NULL == pAdapter)
     {
@@ -8322,8 +8321,6 @@ void hdd_cfg80211_sched_scan_done_callback(void *callbackContext,
     if (0 > ret)
         hddLog(VOS_TRACE_LEVEL_INFO, "%s: NO SCAN result", __func__);
 
-    pScanInfo->mPnoScanPending = FALSE;
-
     cfg80211_sched_scan_results(pHddCtx->wiphy);
     VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
             "%s: cfg80211 scan result database updated", __func__);
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index 1371929f5cab..b7034d827650 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -1927,6 +1927,9 @@ VOS_STATUS hdd_wlan_re_init(void *hif_sc)
       goto err_unregister_pmops;
    }
    vos_set_reinit_in_progress(VOS_MODULE_ID_VOSS, FALSE);
+
+   wlan_hdd_send_svc_nlink_msg(WLAN_SVC_FW_CRASHED_IND);
+
    goto success;
 
 err_unregister_pmops:
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index 7718849b8be0..f5aedb49175d 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -1521,53 +1521,82 @@ static iw_softap_setparam(struct net_device *dev,
                 break;
             }
         case QCASAP_SET_11N_RATE:
-        {
-           u_int8_t preamble, nss, rix;
-           hddLog(LOG1, "SAP WE_SET_11N_RATE val %d", set_value);
-
-           rix = RC_2_RATE_IDX(set_value);
-           if (set_value & 0x80) {
-               preamble = WMI_RATE_PREAMBLE_HT;
-               nss = HT_RC_2_STREAMS(set_value) -1;
-           } else {
-               nss = 0;
-               rix = RC_2_RATE_IDX(set_value);
-               if (set_value & 0x10) {
-                   preamble = WMI_RATE_PREAMBLE_CCK;
-                   if (rix != 0x3)
-                       /* Enable Short preamble always for CCK except 1mbps*/
-                       rix |= 0x4;
-               } else
-                   preamble = WMI_RATE_PREAMBLE_OFDM;
-           }
+            {
+                u_int8_t preamble = 0, nss = 0, rix = 0;
+                tsap_Config_t *pConfig =
+                        &pHostapdAdapter->sessionCtx.ap.sapConfig;
+
+                hddLog(LOG1, "WMI_VDEV_PARAM_FIXED_RATE val %d", set_value);
+
+                rix = RC_2_RATE_IDX(set_value);
+                if (set_value & 0x80) {
+                    if (pConfig->SapHw_mode == eSAP_DOT11_MODE_11b ||
+                        pConfig->SapHw_mode == eSAP_DOT11_MODE_11b_ONLY ||
+                        pConfig->SapHw_mode == eSAP_DOT11_MODE_11g ||
+                        pConfig->SapHw_mode == eSAP_DOT11_MODE_11g_ONLY ||
+                        pConfig->SapHw_mode == eSAP_DOT11_MODE_abg ||
+                        pConfig->SapHw_mode == eSAP_DOT11_MODE_11a) {
+                        hddLog(VOS_TRACE_LEVEL_ERROR, "Not valid mode for HT");
+                        ret = -EIO;
+                        break;
+                    }
+                    preamble = WMI_RATE_PREAMBLE_HT;
+                    nss = HT_RC_2_STREAMS(set_value) - 1;
+                } else if (set_value & 0x10) {
+                    if (pConfig->SapHw_mode == eSAP_DOT11_MODE_11a) {
+                        hddLog(VOS_TRACE_LEVEL_ERROR, "Not valid for cck");
+                        ret = -EIO;
+                        break;
+                    }
+                    preamble = WMI_RATE_PREAMBLE_CCK;
+                    /* Enable Short preamble always for CCK except 1mbps */
+                    if (rix != 0x3)
+                        rix |= 0x4;
+                } else {
+                    if (pConfig->SapHw_mode == eSAP_DOT11_MODE_11b ||
+                        pConfig->SapHw_mode == eSAP_DOT11_MODE_11b_ONLY) {
+                        hddLog(VOS_TRACE_LEVEL_ERROR, "Not valid for OFDM");
+                        ret = -EIO;
+                        break;
+                    }
+                    preamble = WMI_RATE_PREAMBLE_OFDM;
+                }
+                hddLog(LOG1, "WMI_VDEV_PARAM_FIXED_RATE val %d rix %d "
+                    "preamble %x nss %d", set_value, rix, preamble, nss);
 
-           hddLog(LOG1, "SAP WMI_VDEV_PARAM_FIXED_RATE val %d rix %d "
-                  "preamble %x nss %d", set_value, rix, preamble, nss);
+                set_value = (preamble << 6) | (nss << 4) | rix;
+                ret = process_wma_set_command((int)pHostapdAdapter->sessionId,
+                                              (int)WMI_VDEV_PARAM_FIXED_RATE,
+                                              set_value, VDEV_CMD);
+                break;
+            }
 
-           set_value = (preamble << 6) | (nss << 4) | rix;
-           ret = process_wma_set_command((int)pHostapdAdapter->sessionId,
-                                         (int)WMI_VDEV_PARAM_FIXED_RATE,
-                                         set_value, VDEV_CMD);
-           break;
-         }
         case QCASAP_SET_VHT_RATE:
-        {
-           u_int8_t preamble, nss, rix;
-           hddLog(LOG1, "SAP WE_SET_11AC_RATE val %d", set_value);
+            {
+                u_int8_t preamble, nss, rix;
+                tsap_Config_t *pConfig =
+                    &pHostapdAdapter->sessionCtx.ap.sapConfig;
 
-           rix = RC_2_RATE_IDX_11AC(set_value);
-           preamble = WMI_RATE_PREAMBLE_VHT;
-           nss = HT_RC_2_STREAMS_11AC(set_value) -1;
+                if (pConfig->SapHw_mode != eSAP_DOT11_MODE_11ac ||
+                    pConfig->SapHw_mode != eSAP_DOT11_MODE_11ac_ONLY) {
+                    hddLog(VOS_TRACE_LEVEL_ERROR, "Not valid mode for VHT");
+                    ret = -EIO;
+                    break;
+                }
 
-           hddLog(LOG1, "SAP WMI_VDEV_PARAM_FIXED_RATE val %d rix %d "
-                  "preamble %x nss %d", set_value, rix, preamble, nss);
+                rix = RC_2_RATE_IDX_11AC(set_value);
+                preamble = WMI_RATE_PREAMBLE_VHT;
+                nss = HT_RC_2_STREAMS_11AC(set_value) - 1;
 
-           set_value = (preamble << 6) | (nss << 4) | rix;
-           ret = process_wma_set_command((int)pHostapdAdapter->sessionId,
-                                         (int)WMI_VDEV_PARAM_FIXED_RATE,
-                                         set_value, VDEV_CMD);
-           break;
-        }
+                hddLog(LOG1, "WMI_VDEV_PARAM_FIXED_RATE val %d rix %d "
+                    "preamble %x nss %d", set_value, rix, preamble, nss);
+
+                set_value = (preamble << 6) | (nss << 4) | rix;
+                ret = process_wma_set_command((int)pHostapdAdapter->sessionId,
+                                              (int)WMI_VDEV_PARAM_FIXED_RATE,
+                                              set_value, VDEV_CMD);
+                break;
+            }
 
          case QCASAP_SET_SHORT_GI:
              {
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 9c850a136eb5..672d9e42c717 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -10928,6 +10928,7 @@ void hdd_ch_avoid_cb
               {
                   VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
                             "%s: Restarting SAP", __func__);
+                  wlan_hdd_send_svc_nlink_msg(WLAN_SVC_LTE_COEX_IND);
                   restart_sap_in_progress = 1;
                   /* current operating channel is un-safe channel, restart driver */
                   hdd_hostapd_stop(hostapd_adapter->dev);
@@ -10940,6 +10941,51 @@ void hdd_ch_avoid_cb
 }
 #endif /* FEATURE_WLAN_CH_AVOID */
 
+void wlan_hdd_send_svc_nlink_msg(int type)
+{
+    struct sk_buff *skb;
+    struct nlmsghdr *nlh;
+    tAniMsgHdr *ani_hdr;
+
+    skb = alloc_skb(NLMSG_SPACE(WLAN_NL_MAX_PAYLOAD), GFP_KERNEL);
+
+    if(skb == NULL) {
+        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+                "%s: alloc_skb failed", __func__);
+        return;
+    }
+
+    nlh = (struct nlmsghdr *)skb->data;
+    nlh->nlmsg_pid = 0;  /* from kernel */
+    nlh->nlmsg_flags = 0;
+    nlh->nlmsg_seq = 0;
+    nlh->nlmsg_type = WLAN_NL_MSG_SVC;
+
+    ani_hdr = NLMSG_DATA(nlh);
+    ani_hdr->type = type;
+
+    switch(type) {
+    case WLAN_SVC_FW_CRASHED_IND:
+        ani_hdr->length = 0;
+        nlh->nlmsg_len = NLMSG_LENGTH((sizeof(tAniMsgHdr)));
+        skb_put(skb, NLMSG_SPACE(sizeof(tAniMsgHdr)));
+        break;
+    case WLAN_SVC_LTE_COEX_IND:
+        ani_hdr->length = 0;
+        nlh->nlmsg_len = NLMSG_LENGTH((sizeof(tAniMsgHdr)));
+        skb_put(skb, NLMSG_SPACE(sizeof(tAniMsgHdr)));
+        break;
+    default:
+        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+                "WLAN SVC: Attempt to send unknown nlink message %d\n", type);
+        kfree_skb(skb);
+        return;
+    }
+
+    nl_srv_bcast(skb);
+
+    return;
+}
 //Register the module init/exit functions
 module_init(hdd_module_init);
 module_exit(hdd_module_exit);
diff --git a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
index e43da5bebedf..64fff5970a58 100644
--- a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
@@ -1658,6 +1658,42 @@ VOS_STATUS hdd_softap_rx_packet_cbk(v_VOID_t *vosContext,
 
    return VOS_STATUS_SUCCESS;
 }
+
+#ifdef IPA_OFFLOAD
+/**============================================================================
+  @brief hdd_softap_rx_mul_packet_cbk() - Receive callback registered with TL.
+  IPA integrated platform, TL Shim will give multiple RX frames with NETBUF
+  link. Linked frames should be un-link and send to NETDEV.
+
+  @param vosContext      : [in] pointer to VOS context
+  @param rx_buf_list     : [in] pointer to rx adf_nbuf linked list
+  @param staId           : [in] Station Id (Adress 1 Index)
+
+  @return                : VOS_STATUS_E_FAILURE if any errors encountered,
+                         : VOS_STATUS_SUCCESS otherwise
+  ===========================================================================*/
+VOS_STATUS hdd_softap_rx_mul_packet_cbk(v_VOID_t *vosContext,
+                                    adf_nbuf_t rx_buf_list, v_U8_t staId)
+{
+   adf_nbuf_t buf, next_buf;
+   VOS_STATUS status;
+
+   buf = rx_buf_list;
+   while(buf)
+   {
+      next_buf = adf_nbuf_queue_next(buf);
+      status = hdd_softap_rx_packet_cbk(vosContext, buf, staId);
+      if(!VOS_IS_STATUS_SUCCESS(status))
+      {
+         VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+                   "%s: RX fail, satus %d", __func__, status);
+         return status;
+      }
+      buf = next_buf;
+   }
+   return VOS_STATUS_SUCCESS;
+}
+#endif /* IPA_OFFLOAD */
 #endif
 
 VOS_STATUS hdd_softap_DeregisterSTA( hdd_adapter_t *pAdapter, tANI_U8 staId )
@@ -1809,13 +1845,16 @@ VOS_STATUS hdd_softap_RegisterSTA( hdd_adapter_t *pAdapter,
                                          hdd_softap_tx_complete_cbk,
                                          hdd_softap_tx_fetch_packet_cbk, &staDesc, 0 );
    } else {
-#endif
+      vosStatus = WLANTL_RegisterSTAClient( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext,
+                                         hdd_softap_rx_mul_packet_cbk,
+                                         hdd_softap_tx_complete_cbk,
+                                         hdd_softap_tx_fetch_packet_cbk, &staDesc, 0 );
+   }
+#else
    vosStatus = WLANTL_RegisterSTAClient( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext, 
                                          hdd_softap_rx_packet_cbk, 
                                          hdd_softap_tx_complete_cbk, 
                                          hdd_softap_tx_fetch_packet_cbk, &staDesc, 0 );
-#ifdef IPA_OFFLOAD
-   }
 #endif
    if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) )
    {
diff --git a/CORE/HDD/src/wlan_hdd_tx_rx.c b/CORE/HDD/src/wlan_hdd_tx_rx.c
index ce7e64941b66..ab764e816143 100644
--- a/CORE/HDD/src/wlan_hdd_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_tx_rx.c
@@ -2055,4 +2055,41 @@ void hdd_tx_rx_pkt_cnt_stat_timer_handler( void *phddctx)
 {
 
 }
+
+#ifdef IPA_OFFLOAD
+/**============================================================================
+  @brief hdd_rx_mul_packet_cbk() - Receive callback registered with TL.
+  IPA integrated platform, TL Shim will give multiple RX frames with NETBUF
+  link. Linked frames should be un-link and send to NETDEV.
+
+  @param vosContext      : [in] pointer to VOS context
+  @param rx_buf_list     : [in] pointer to rx adf_nbuf linked list
+  @param staId           : [in] Station Id (Adress 1 Index)
+
+  @return                : VOS_STATUS_E_FAILURE if any errors encountered,
+                         : VOS_STATUS_SUCCESS otherwise
+  ===========================================================================*/
+VOS_STATUS hdd_rx_mul_packet_cbk(v_VOID_t *vosContext,
+                                    adf_nbuf_t rx_buf_list, v_U8_t staId)
+{
+   adf_nbuf_t buf, next_buf;
+   VOS_STATUS status;
+
+   buf = rx_buf_list;
+   while(buf)
+   {
+      next_buf = adf_nbuf_queue_next(buf);
+      status = hdd_rx_packet_cbk(vosContext, buf, staId);
+      if(!VOS_IS_STATUS_SUCCESS(status))
+      {
+         VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+                   "%s: RX fail, status %d", __func__, status);
+         return status;
+      }
+      buf = next_buf;
+   }
+   return VOS_STATUS_SUCCESS;
+}
+#endif /* IPA_OFFLOAD */
+
 #endif /* QCA_WIFI_2_0 */
diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h
index b7091ec91fba..0e229ed384dd 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            40
+#define QWLAN_VERSION_BUILD            41
 
-#define QWLAN_VERSIONSTR               "1.0.0.40"
+#define QWLAN_VERSIONSTR               "1.0.0.41"
 
 #ifdef QCA_WIFI_2_0
 
diff --git a/CORE/MAC/src/pe/include/rrmGlobal.h b/CORE/MAC/src/pe/include/rrmGlobal.h
index ca01c387efb1..344da73f9a09 100644
--- a/CORE/MAC/src/pe/include/rrmGlobal.h
+++ b/CORE/MAC/src/pe/include/rrmGlobal.h
@@ -47,8 +47,9 @@ typedef enum eRrmRetStatus
 
 typedef enum eRrmMsgReqSource
 {
-    eRRM_MSG_SOURCE_DRV         = 1, /* for both 11k and legacy ccx */
-    eRRM_MSG_SOURCE_CCX_UPLOAD  = 2, /* ccx upload approach */
+    eRRM_MSG_SOURCE_LEGACY_CCX  = 1, /* legacy ccx */
+    eRRM_MSG_SOURCE_11K         = 2, /* 11k */
+    eRRM_MSG_SOURCE_CCX_UPLOAD  = 3, /* ccx upload approach */
 } tRrmMsgReqSource;
 
 typedef struct sSirChannelInfo
diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index 785fe1c61bef..c64b1ed57dbc 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.c
@@ -580,31 +580,31 @@ static tSirRetStatus __limInitConfig( tpAniSirGlobal pMac )
 
    /* WNI_CFG_MAX_PS_POLL */
 
-   /* Allocate and fill in power save configuration. */
-   pPowerSaveConfig = vos_mem_malloc(sizeof(tSirPowerSaveCfg));
-   if (NULL == pPowerSaveConfig)
-   {
-      PELOGE(limLog(pMac, LOGE, FL("LIM: Cannot allocate memory for power save "
-                                  "configuration"));)
-      return eSIR_FAILURE;
-   }
-       
-   /* This context should be valid if power-save configuration message has been
-    * already dispatched during initialization process. Re-using the present
-    * configuration mask
-    */
    if (!pMac->psOffloadEnabled)
    {
-      vos_mem_copy(pPowerSaveConfig, (tANI_U8 *)&pMac->pmm.gPmmCfg,
+       /* Allocate and fill in power save configuration. */
+       pPowerSaveConfig = vos_mem_malloc(sizeof(tSirPowerSaveCfg));
+       if (NULL == pPowerSaveConfig)
+       {
+           PELOGE(limLog(pMac, LOGE,
+                         FL("LIM: Cannot allocate memory for power save configuration"));)
+           return eSIR_FAILURE;
+       }
+
+       /* This context should be valid if power-save configuration message has
+        * been already dispatched during initialization process. Re-using the
+        * present configuration mask
+        */
+       vos_mem_copy(pPowerSaveConfig, (tANI_U8 *)&pMac->pmm.gPmmCfg,
                    sizeof(tSirPowerSaveCfg));
 
-      /* Note: it is okay to do this since DAL/HAL is alrady started */
-      if ( (pmmSendPowerSaveCfg(pMac, pPowerSaveConfig)) != eSIR_SUCCESS)
-      {
-	      PELOGE(limLog(pMac, LOGE,
+       /* Note: it is okay to do this since DAL/HAL is alrady started */
+       if ( (pmmSendPowerSaveCfg(pMac, pPowerSaveConfig)) != eSIR_SUCCESS)
+       {
+              PELOGE(limLog(pMac, LOGE,
                             FL("LIM: pmmSendPowerSaveCfg() failed "));)
-           return eSIR_FAILURE;
-      }
+              return eSIR_FAILURE;
+       }
    }
 
    /* WNI_CFG_BG_SCAN_CHANNEL_LIST_CHANNEL_LIST */
diff --git a/CORE/MAC/src/pe/rrm/rrmApi.c b/CORE/MAC/src/pe/rrm/rrmApi.c
index 1cac5e1c0f39..dda9ab07d884 100644
--- a/CORE/MAC/src/pe/rrm/rrmApi.c
+++ b/CORE/MAC/src/pe/rrm/rrmApi.c
@@ -540,7 +540,6 @@ rrmProcessBeaconReportReq( tpAniSirGlobal pMac,
    tANI_U16 measDuration, maxMeasduration;
    tANI_S8  maxDuration;
    tANI_U8  sign;
-   tANI_U16 index;
 
    if( pBeaconReq->measurement_request.Beacon.BeaconReporting.present && 
        (pBeaconReq->measurement_request.Beacon.BeaconReporting.reportingCondition != 0) )
@@ -639,10 +638,12 @@ rrmProcessBeaconReportReq( tpAniSirGlobal pMac,
    pSmeBcnReportReq->messageType = eWNI_SME_BEACON_REPORT_REQ_IND;
    pSmeBcnReportReq->length = sizeof( tSirBeaconReportReqInd );
    pSmeBcnReportReq->uDialogToken = pBeaconReq->measurement_token;
-   pSmeBcnReportReq->msgSource = eRRM_MSG_SOURCE_DRV;
+   pSmeBcnReportReq->msgSource = eRRM_MSG_SOURCE_11K;
    pSmeBcnReportReq->randomizationInterval = SYS_TU_TO_MS (pBeaconReq->measurement_request.Beacon.randomization);
    pSmeBcnReportReq->channelInfo.regulatoryClass = pBeaconReq->measurement_request.Beacon.regClass;
    pSmeBcnReportReq->channelInfo.channelNum = pBeaconReq->measurement_request.Beacon.channel;
+   pSmeBcnReportReq->measurementDuration[0] = SYS_TU_TO_MS(measDuration);
+   pSmeBcnReportReq->fMeasurementtype[0]    = pBeaconReq->measurement_request.Beacon.meas_mode;
    vos_mem_copy(pSmeBcnReportReq->macaddrBssid, pBeaconReq->measurement_request.Beacon.BSSID,
                 sizeof(tSirMacAddr));
 
@@ -660,7 +661,6 @@ rrmProcessBeaconReportReq( tpAniSirGlobal pMac,
    if( pBeaconReq->measurement_request.Beacon.num_APChannelReport )
    {
       tANI_U8 *pChanList = pSmeBcnReportReq->channelList.channelNumber;
-      tANI_U16 index2 = 0;
       for( num_APChanReport = 0 ; num_APChanReport < pBeaconReq->measurement_request.Beacon.num_APChannelReport ; num_APChanReport++ )
       {
          vos_mem_copy(pChanList,
@@ -668,18 +668,8 @@ rrmProcessBeaconReportReq( tpAniSirGlobal pMac,
           pBeaconReq->measurement_request.Beacon.APChannelReport[num_APChanReport].num_channelList);
 
          pChanList += pBeaconReq->measurement_request.Beacon.APChannelReport[num_APChanReport].num_channelList;
-         for( index = 0; index < (pBeaconReq->measurement_request.Beacon.APChannelReport[num_APChanReport].num_channelList); index++ )
-         {
-            pSmeBcnReportReq->measurementDuration[index2] = SYS_TU_TO_MS(measDuration);
-            pSmeBcnReportReq->fMeasurementtype[index2++]  = pBeaconReq->measurement_request.Beacon.meas_mode;
-         }
       }
    }
-   else
-   {
-      pSmeBcnReportReq->measurementDuration[0] = SYS_TU_TO_MS(measDuration);
-      pSmeBcnReportReq->fMeasurementtype[0] = pBeaconReq->measurement_request.Beacon.meas_mode;
-   }
 
    //Send request to SME.
    mmhMsg.type    = eWNI_SME_BEACON_REPORT_REQ_IND;
diff --git a/CORE/SERVICES/BMI/ol_fw.c b/CORE/SERVICES/BMI/ol_fw.c
index 74508100550b..8ca436d645a8 100644
--- a/CORE/SERVICES/BMI/ol_fw.c
+++ b/CORE/SERVICES/BMI/ol_fw.c
@@ -287,7 +287,7 @@ exit:
 }
 
 static int ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file,
-                    	 u_int32_t address, bool compressed)
+			 u_int32_t address, bool compressed)
 {
 	int status = EOK;
 	const char *filename = NULL;
@@ -821,7 +821,7 @@ ol_configure_target(struct ol_softc *scn)
 
 	/* If host is running on a BE CPU, set the host interest area */
 	{
-#ifdef BIG_ENDIAN_HOST 
+#ifdef BIG_ENDIAN_HOST
 		param = 1;
 #else
 		param = 0;
@@ -1141,4 +1141,3 @@ u_int8_t ol_get_number_of_peers_supported(struct ol_softc *scn)
 	}
 	return max_no_of_peers;
 }
-
diff --git a/CORE/SERVICES/COMMON/_ieee80211_common.h b/CORE/SERVICES/COMMON/_ieee80211_common.h
index ccf707c1aae3..3a0c9a431c07 100644
--- a/CORE/SERVICES/COMMON/_ieee80211_common.h
+++ b/CORE/SERVICES/COMMON/_ieee80211_common.h
@@ -88,7 +88,7 @@ enum ieee80211_opmode {
 
 enum ieee80211_cwm_mode {
     IEEE80211_CWM_MODE20,
-    IEEE80211_CWM_MODE2040,         
+    IEEE80211_CWM_MODE2040,
     IEEE80211_CWM_MODE40,
     IEEE80211_CWM_MODEMAX
 
@@ -395,18 +395,18 @@ enum ieee80211_scanmode {
 #define IEEE80211_CHAN_11AC_VHT40PLUS \
     (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_VHT40PLUS)
 #define IEEE80211_CHAN_11AC_VHT40MINUS \
-    (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_VHT40MINUS)    
+    (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_VHT40MINUS)
 #define IEEE80211_CHAN_11AC_VHT80 \
     (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_VHT80)
 #define IEEE80211_IS_CHAN_11AC_VHT20(_c) \
     (((_c)->ic_flags & IEEE80211_CHAN_11AC_VHT20) == IEEE80211_CHAN_11AC_VHT20)
-    
+
 #define IEEE80211_IS_CHAN_11AC_VHT40(_c) \
     (((_c)->ic_flags & (IEEE80211_CHAN_VHT40PLUS | IEEE80211_CHAN_VHT40MINUS)) !=0)
 #define IEEE80211_IS_CHAN_11AC_VHT40PLUS(_c) \
     (((_c)->ic_flags & IEEE80211_CHAN_11AC_VHT40PLUS) == IEEE80211_CHAN_11AC_VHT40PLUS)
 #define IEEE80211_IS_CHAN_11AC_VHT40MINUS(_c) \
-    (((_c)->ic_flags & IEEE80211_CHAN_11AC_VHT40MINUS) == IEEE80211_CHAN_11AC_VHT40MINUS)    
+    (((_c)->ic_flags & IEEE80211_CHAN_11AC_VHT40MINUS) == IEEE80211_CHAN_11AC_VHT40MINUS)
 #define IEEE80211_IS_CHAN_11AC_VHT80(_c) \
     (((_c)->ic_flags & IEEE80211_CHAN_11AC_VHT80) == IEEE80211_CHAN_11AC_VHT80)
 
@@ -458,9 +458,9 @@ enum ieee80211_scanmode {
 #define IEEE80211_AMPDU_LIMIT_MIN           (1 * 1024)
 #define IEEE80211_AMPDU_LIMIT_MAX           (64 * 1024 - 1)
 #define IEEE80211_AMPDU_LIMIT_DEFAULT       IEEE80211_AMPDU_LIMIT_MAX
-#define IEEE80211_AMPDU_SUBFRAME_MIN        2 
-#define IEEE80211_AMPDU_SUBFRAME_MAX        64 
-#define IEEE80211_AMPDU_SUBFRAME_DEFAULT    32 
+#define IEEE80211_AMPDU_SUBFRAME_MIN        2
+#define IEEE80211_AMPDU_SUBFRAME_MAX        64
+#define IEEE80211_AMPDU_SUBFRAME_DEFAULT    32
 #define IEEE80211_AMSDU_LIMIT_MAX           4096
 #define IEEE80211_RIFS_AGGR_DIV             10
 #define IEEE80211_MAX_AMPDU_MIN             0
diff --git a/CORE/SERVICES/COMMON/adf/a_base_types.h b/CORE/SERVICES/COMMON/adf/a_base_types.h
index ca37f494d275..ac80788b700f 100644
--- a/CORE/SERVICES/COMMON/adf/a_base_types.h
+++ b/CORE/SERVICES/COMMON/adf/a_base_types.h
@@ -31,7 +31,7 @@
 
 
 
-/** 
+/**
  * @brief The basic data types
  */
 typedef __a_uint8_t     a_uint8_t; /**< 1 Byte */
@@ -51,12 +51,12 @@ enum a_bool {
 typedef a_uint8_t   a_bool_t;/**< 1 Byte */
 
 
-/** 
+/**
  * @brief Generic status for the API's
  */
 enum {
     A_STATUS_OK = 0,
-    A_STATUS_FAILED, 
+    A_STATUS_FAILED,
     A_STATUS_ENOENT,
     A_STATUS_ENOMEM,
     A_STATUS_EINVAL,
diff --git a/CORE/SERVICES/COMMON/adf/adf_nbuf.c b/CORE/SERVICES/COMMON/adf/adf_nbuf.c
index b16da4708acd..a59e14ecb347 100644
--- a/CORE/SERVICES/COMMON/adf/adf_nbuf.c
+++ b/CORE/SERVICES/COMMON/adf/adf_nbuf.c
@@ -39,12 +39,12 @@
  *        some space in the front, since the reserve is done
  *        after alignment the reserve value if being unaligned
  *        will result in an unaligned address.
- * 
+ *
  * @param hdl
  * @param size
  * @param reserve
  * @param align
- * 
+ *
  * @return nbuf or NULL if no memory
  */
 struct sk_buff *
@@ -138,7 +138,7 @@ __adf_nbuf_shared(struct sk_buff *skb)
  * @brief create a nbuf map
  * @param osdev
  * @param dmap
- * 
+ *
  * @return a_status_t
  */
 a_status_t
@@ -152,13 +152,13 @@ __adf_nbuf_dmamap_create(adf_os_device_t osdev, __adf_os_dma_map_t *dmap)
     (*dmap) = kzalloc(sizeof(struct __adf_os_dma_map), GFP_KERNEL);
     if(!(*dmap))
         error = A_STATUS_ENOMEM;
-    
+
     return error;
 }
 
 /**
  * @brief free the nbuf map
- * 
+ *
  * @param osdev
  * @param dmap
  */
@@ -170,12 +170,12 @@ __adf_nbuf_dmamap_destroy(adf_os_device_t osdev, __adf_os_dma_map_t dmap)
 
 /**
  * @brief get the dma map of the nbuf
- * 
+ *
  * @param osdev
  * @param bmap
  * @param skb
  * @param dir
- * 
+ *
  * @return a_status_t
  */
 a_status_t
@@ -249,36 +249,36 @@ __adf_nbuf_unmap_single(
     adf_os_device_t osdev, adf_nbuf_t buf, adf_os_dma_dir_t dir)
 {
 #if !defined(A_SIMOS_DEVHOST)
-    dma_unmap_single(osdev->dev, NBUF_MAPPED_PADDR_LO(buf), 
+    dma_unmap_single(osdev->dev, NBUF_MAPPED_PADDR_LO(buf),
                      skb_end_pointer(buf) - buf->data, dir);
 #endif	/* #if !defined(A_SIMOS_DEVHOST) */
 }
 
 /**
- * @brief return the dma map info 
- * 
+ * @brief return the dma map info
+ *
  * @param[in]  bmap
  * @param[out] sg (map_info ptr)
  */
-void 
+void
 __adf_nbuf_dmamap_info(__adf_os_dma_map_t bmap, adf_os_dmamap_info_t *sg)
 {
     adf_os_assert(bmap->mapped);
     adf_os_assert(bmap->nsegs <= ADF_OS_MAX_SCATTER);
-    
-    memcpy(sg->dma_segs, bmap->seg, bmap->nsegs * 
+
+    memcpy(sg->dma_segs, bmap->seg, bmap->nsegs *
            sizeof(struct __adf_os_segment));
     sg->nsegs = bmap->nsegs;
 }
 /**
  * @brief return the frag data & len, where frag no. is
  *        specified by the index
- * 
+ *
  * @param[in] buf
  * @param[out] sg (scatter/gather list of all the frags)
- * 
+ *
  */
-void  
+void
 __adf_nbuf_frag_info(struct sk_buff *skb, adf_os_sglist_t  *sg)
 {
 #if defined(ADF_OS_DEBUG) || defined(__ADF_SUPPORT_FRAG_MEM)
@@ -294,7 +294,7 @@ __adf_nbuf_frag_info(struct sk_buff *skb, adf_os_sglist_t  *sg)
 #else
     for(int i = 1; i <= sh->nr_frags; i++){
         skb_frag_t    *f        = &sh->frags[i - 1];
-        sg->sg_segs[i].vaddr    = (uint8_t *)(page_address(f->page) + 
+        sg->sg_segs[i].vaddr    = (uint8_t *)(page_address(f->page) +
                                   f->page_offset);
         sg->sg_segs[i].len      = f->size;
 
@@ -304,7 +304,7 @@ __adf_nbuf_frag_info(struct sk_buff *skb, adf_os_sglist_t  *sg)
 #endif
 }
 
-a_status_t 
+a_status_t
 __adf_nbuf_set_rx_cksum(struct sk_buff *skb, adf_nbuf_rx_cksum_t *cksum)
 {
     switch (cksum->l4_result) {
@@ -347,8 +347,8 @@ __adf_nbuf_get_tx_cksum(struct sk_buff *skb)
     }
 }
 
-a_status_t      
-__adf_nbuf_get_vlan_info(adf_net_handle_t hdl, struct sk_buff *skb, 
+a_status_t
+__adf_nbuf_get_vlan_info(adf_net_handle_t hdl, struct sk_buff *skb,
                          adf_net_vlanhdr_t *vlan)
 {
      return A_STATUS_OK;
diff --git a/CORE/SERVICES/COMMON/adf/adf_nbuf.h b/CORE/SERVICES/COMMON/adf/adf_nbuf.h
index 6a72bc8ae26d..3b6979fd9d14 100644
--- a/CORE/SERVICES/COMMON/adf/adf_nbuf.h
+++ b/CORE/SERVICES/COMMON/adf/adf_nbuf.h
@@ -28,13 +28,13 @@
 
 /**
  * @defgroup adf_nbuf_public network buffer API
- */ 
+ */
 
 /**
  * @ingroup adf_nbuf_public
  * @file adf_nbuf.h
  * This file defines the network buffer abstraction.
- */ 
+ */
 
 #ifndef _ADF_NBUF_H
 #define _ADF_NBUF_H
@@ -54,8 +54,8 @@ typedef __adf_nbuf_t         adf_nbuf_t;
 
 /**
  * @brief Dma map callback prototype
- */ 
-typedef void (*adf_os_dma_map_cb_t)(void *arg, adf_nbuf_t buf, 
+ */
+typedef void (*adf_os_dma_map_cb_t)(void *arg, adf_nbuf_t buf,
                                     adf_os_dma_map_t dmap);
 
 /**
@@ -77,10 +77,10 @@ typedef __adf_nbuf_queue_t   adf_nbuf_queue_t;
  *          - need space in adf_drv's software descriptor
  *          - are typically created during adf_drv_create
  *          - need to be created before any API(adf_nbuf_map) that uses them
- * 
+ *
  * @param[in]  osdev os device
  * @param[out] dmap  map handle
- * 
+ *
  * @return status of the operation
  */
 static inline a_status_t
@@ -93,7 +93,7 @@ adf_nbuf_dmamap_create(adf_os_device_t osdev,
 
 /**
  * @brief Delete a dmap map
- * 
+ *
  * @param[in] osdev os device
  * @param[in] dmap
  */
@@ -128,8 +128,8 @@ adf_nbuf_dmamap_set_cb(adf_os_dma_map_t dmap, adf_os_dma_map_cb_t cb,
  * @return status of the operation
  */
 static inline a_status_t
-adf_nbuf_map(adf_os_device_t        osdev, 
-             adf_nbuf_t             buf, 
+adf_nbuf_map(adf_os_device_t        osdev,
+             adf_nbuf_t             buf,
              adf_os_dma_dir_t       dir)
 {
 #if defined(HIF_PCI) || defined(QCA_WIFI_ISOC)
@@ -149,8 +149,8 @@ adf_nbuf_map(adf_os_device_t        osdev,
  * @param[in] dir    DMA direction
  */
 static inline void
-adf_nbuf_unmap(adf_os_device_t      osdev, 
-               adf_nbuf_t           buf, 
+adf_nbuf_unmap(adf_os_device_t      osdev,
+               adf_nbuf_t           buf,
                adf_os_dma_dir_t     dir)
 {
 #if defined(HIF_PCI) || defined(QCA_WIFI_ISOC)
@@ -228,7 +228,7 @@ adf_nbuf_frag_push_head(
 
 /**
  * @brief returns information about the mapped buf
- * 
+ *
  * @param[in]  bmap map handle
  * @param[out] sg   map info
  */
@@ -251,20 +251,20 @@ adf_nbuf_dmamap_info(adf_os_dma_map_t bmap, adf_os_dmamap_info_t *sg)
  * The nbuf created is guarenteed to have only 1 physical segment
  *
  * @param[in] hdl   platform device object
- * @param[in] size  data buffer size for this adf_nbuf including max header 
+ * @param[in] size  data buffer size for this adf_nbuf including max header
  *                  size
  * @param[in] reserve  headroom to start with.
  * @param[in] align    alignment for the start buffer.
- * @param[i] prio   Indicate if the nbuf is high priority (some OSes e.g darwin 
- *                   polls few times if allocation fails and priority is  TRUE) 
+ * @param[i] prio   Indicate if the nbuf is high priority (some OSes e.g darwin
+ *                   polls few times if allocation fails and priority is  TRUE)
  *
  * @return The new adf_nbuf instance or NULL if there's not enough memory.
  */
-static inline adf_nbuf_t 
+static inline adf_nbuf_t
 adf_nbuf_alloc(adf_os_device_t      osdev,
                adf_os_size_t        size,
                int                  reserve,
-               int                  align, 
+               int                  align,
                int                  prio)
 {
     return __adf_nbuf_alloc(osdev, size, reserve,align, prio);
@@ -324,10 +324,10 @@ adf_nbuf_tx_free(adf_nbuf_t buf_list, int tx_err)
  *        buf. Note that this can allocate a new buffer, or
  *        change geometry of the orignial buffer. The new buffer
  *        is returned in the (new_buf).
- * 
+ *
  * @param[in] buf (older buffer)
  * @param[in] headroom
- * 
+ *
  * @return newly allocated buffer
  */
 static inline adf_nbuf_t
@@ -340,10 +340,10 @@ adf_nbuf_realloc_headroom(adf_nbuf_t buf, a_uint32_t headroom)
 /**
  * @brief expand the tailroom to the new tailroom, but the buffer
  * remains the same
- * 
+ *
  * @param[in] buf       buffer
  * @param[in] tailroom  new tailroom
- * 
+ *
  * @return expanded buffer or NULL on failure
  */
 static inline adf_nbuf_t
@@ -361,11 +361,11 @@ adf_nbuf_realloc_tailroom(adf_nbuf_t buf, a_uint32_t tailroom)
  *        having an extra API is that some OS do this in more
  *        optimized way, rather than calling realloc (head/tail)
  *        back to back.
- * 
+ *
  * @param[in] buf       buffer
- * @param[in] headroom  new headroom  
+ * @param[in] headroom  new headroom
  * @param[in] tailroom  new tailroom
- * 
+ *
  * @return expanded buffer
  */
 static inline adf_nbuf_t
@@ -382,9 +382,9 @@ adf_nbuf_expand(adf_nbuf_t buf, a_uint32_t headroom, a_uint32_t tailroom)
  *        effect, it also "linearizes" a buffer (which is
  *        perhaps why you'll use it mostly). It creates a
  *        writeable copy.
- * 
+ *
  * @param[in] buf source nbuf to copy from
- * 
+ *
  * @return the new nbuf
  */
 static inline adf_nbuf_t
@@ -397,10 +397,10 @@ adf_nbuf_copy(adf_nbuf_t buf)
 /**
  * @brief link two nbufs, the new buf is piggybacked into the
  *        older one.
- * 
+ *
  * @param[in] dst   buffer to piggyback into
  * @param[in] src   buffer to put
- * 
+ *
  * @return status of the call - 0 successful
  */
 static inline a_status_t
@@ -412,9 +412,9 @@ adf_nbuf_cat(adf_nbuf_t dst, adf_nbuf_t src)
 
 /**
  * @brief return the length of the copy bits for skb
- * 
+ *
  * @param skb, offset, len, to
- * 
+ *
  * @return int32_t
  */
 static inline int32_t
@@ -426,12 +426,12 @@ adf_nbuf_copy_bits(adf_nbuf_t nbuf, u_int32_t offset, u_int32_t len, void *to)
 
 /**
  * @brief clone the nbuf (copy is readonly)
- * 
+ *
  * @param[in] buf nbuf to clone from
- * 
+ *
  * @return cloned buffer
  */
-static inline adf_nbuf_t 
+static inline adf_nbuf_t
 adf_nbuf_clone(adf_nbuf_t buf)
 {
     return(__adf_nbuf_clone(buf));
@@ -444,12 +444,12 @@ adf_nbuf_clone(adf_nbuf_t buf)
  *         other users.If the nbuf is a clone then this function
  *         creates a new copy of the data. If the buffer is not
  *         a clone the original buffer is returned.
- * 
+ *
  * @param[in] buf   source nbuf to create a writable copy from
- * 
+ *
  * @return new buffer which is writeable
  */
-static inline adf_nbuf_t 
+static inline adf_nbuf_t
 adf_nbuf_unshare(adf_nbuf_t buf)
 {
     return(__adf_nbuf_unshare(buf));
@@ -490,9 +490,9 @@ adf_nbuf_data(adf_nbuf_t buf)
 
 /**
  * @brief return the amount of headroom int the current nbuf
- * 
+ *
  * @param[in] buf   buffer
- * 
+ *
  * @return amount of head room
  */
 static inline a_uint32_t
@@ -504,10 +504,10 @@ adf_nbuf_headroom(adf_nbuf_t buf)
 
 /**
  * @brief return the amount of tail space available
- * 
+ *
  * @param[in] buf   buffer
- * 
- * @return amount of tail room 
+ *
+ * @return amount of tail room
  */
 static inline a_uint32_t
 adf_nbuf_tailroom(adf_nbuf_t buf)
@@ -588,7 +588,7 @@ adf_nbuf_pull_head(adf_nbuf_t buf, adf_os_size_t size)
 
 
 /**
- * 
+ *
  * @brief trim data out from the end
  *
  * @param[in] buf   buf instance
@@ -632,9 +632,9 @@ adf_nbuf_set_pktlen(adf_nbuf_t buf, uint32_t len)
 
 /**
  * @brief test whether the nbuf is cloned or not
- * 
+ *
  * @param[in] buf   buffer
- * 
+ *
  * @return TRUE if it is cloned, else FALSE
  */
 static inline a_bool_t
@@ -644,7 +644,7 @@ adf_nbuf_is_cloned(adf_nbuf_t buf)
 }
 
 /**
- * 
+ *
  * @brief trim data out from the end
  *
  * @param[in] buf   buf instance
@@ -665,19 +665,19 @@ adf_nbuf_reserve(adf_nbuf_t buf, adf_os_size_t size)
 
 /**
  * @brief return the frag pointer & length of the frag
- * 
+ *
  * @param[in]  buf   buffer
  * @param[out] sg    this will return all the frags of the nbuf
- * 
+ *
  */
-static inline void 
-adf_nbuf_frag_info(adf_nbuf_t buf, adf_os_sglist_t *sg) 
+static inline void
+adf_nbuf_frag_info(adf_nbuf_t buf, adf_os_sglist_t *sg)
 {
     __adf_nbuf_frag_info(buf, sg);
 }
 /**
  * @brief return the data pointer & length of the header
- * 
+ *
  * @param[in]  buf  nbuf
  * @param[out] addr data pointer
  * @param[out] len  length of the data
@@ -694,9 +694,9 @@ adf_nbuf_peek_header(adf_nbuf_t buf, a_uint8_t **addr, a_uint32_t *len)
 
 /**
  * @brief get the priv pointer from the nbuf'f private space
- * 
+ *
  * @param[in] buf
- * 
+ *
  * @return data pointer to typecast into your priv structure
  */
 static inline a_uint8_t *
@@ -763,9 +763,9 @@ adf_nbuf_queue_remove(adf_nbuf_queue_t *head)
 
 /**
  * @brief get the length of the queue
- * 
+ *
  * @param[in] head  buf queue head
- * 
+ *
  * @return length of the queue
  */
 static inline a_uint32_t
@@ -777,12 +777,12 @@ adf_nbuf_queue_len(adf_nbuf_queue_t *head)
 
 /**
  * @brief get the first guy/packet in the queue
- * 
+ *
  * @param[in] head  buf queue head
- * 
+ *
  * @return first buffer in queue
  */
-static inline adf_nbuf_t 
+static inline adf_nbuf_t
 adf_nbuf_queue_first(adf_nbuf_queue_t *head)
 {
     return (__adf_nbuf_queue_first(head));
@@ -792,9 +792,9 @@ adf_nbuf_queue_first(adf_nbuf_queue_t *head)
 /**
  * @brief get the next guy/packet of the given buffer (or
  *        packet)
- * 
+ *
  * @param[in] buf   buffer
- * 
+ *
  * @return next buffer/packet
  */
 static inline adf_nbuf_t
@@ -806,7 +806,7 @@ adf_nbuf_queue_next(adf_nbuf_t buf)
 
 /**
  * @brief Check if the buf queue is empty
- * 
+ *
  * @param[in] nbq   buf queue handle
  *
  * @return    TRUE  if queue is empty
@@ -903,7 +903,7 @@ adf_nbuf_append_ext_list(adf_nbuf_t head_buf, adf_nbuf_t ext_list,
 
 /**
  * @brief Gets the tx checksumming to be performed on this buf
- * 
+ *
  * @param[in]  buf       buffer
  * @param[out] hdr_off   the (tcp) header start
  * @param[out] where     the checksum offset
@@ -917,7 +917,7 @@ adf_nbuf_tx_cksum_info(adf_nbuf_t buf, a_uint8_t **hdr_off, a_uint8_t **where)
 
 /**
  * @brief Gets the tx checksum offload demand
- * 
+ *
  * @param[in]  buf             buffer
  * @return adf_nbuf_tx_cksum_t checksum offload demand for the frame
  */
@@ -930,7 +930,7 @@ adf_nbuf_get_tx_cksum(adf_nbuf_t buf)
 /**
  * @brief Drivers that support hw checksumming use this to
  *        indicate checksum info to the stack.
- * 
+ *
  * @param[in]  buf      buffer
  * @param[in]  cksum    checksum
  */
@@ -944,7 +944,7 @@ adf_nbuf_set_rx_cksum(adf_nbuf_t buf, adf_nbuf_rx_cksum_t *cksum)
 /**
  * @brief Drivers that are capable of TCP Large segment offload
  *        use this to get the offload info out of an buf.
- * 
+ *
  * @param[in]  buf  buffer
  * @param[out] tso  offload info
  */
@@ -964,26 +964,26 @@ adf_nbuf_set_vlan_info(adf_nbuf_t buf, adf_net_vlan_tag_t vlan_tag)
 /**
  * @brief This function extracts the vid & priority from an
  *        nbuf
- * 
- * 
+ *
+ *
  * @param[in] hdl   net handle
  * @param[in] buf   buffer
  * @param[in] vlan  vlan header
- * 
+ *
  * @return status of the operation
  */
 static inline a_status_t
-adf_nbuf_get_vlan_info(adf_net_handle_t hdl, adf_nbuf_t buf, 
+adf_nbuf_get_vlan_info(adf_net_handle_t hdl, adf_nbuf_t buf,
                        adf_net_vlanhdr_t *vlan)
 {
     return __adf_nbuf_get_vlan_info(hdl, buf, vlan);
 }
 
 /**
- * @brief This function extracts the TID value from nbuf 
- * 
+ * @brief This function extracts the TID value from nbuf
+ *
  * @param[in] buf   buffer
- * 
+ *
  * @return TID value
  */
 static inline a_uint8_t
@@ -1006,10 +1006,10 @@ adf_nbuf_set_tid(adf_nbuf_t buf, a_uint8_t tid)
 }
 
 /**
- * @brief This function extracts the exemption type from nbuf 
- * 
+ * @brief This function extracts the exemption type from nbuf
+ *
  * @param[in] buf   buffer
- * 
+ *
  * @return exemption type
  */
 static inline a_uint8_t
@@ -1026,12 +1026,12 @@ adf_nbuf_reset_ctxt(__adf_nbuf_t nbuf)
 
 /**
  * @brief This function peeks data into the buffer at given offset
- * 
+ *
  * @param[in] buf   buffer
  * @param[out] data  peeked output buffer
  * @param[in] off   offset
  * @param[in] len   length of buffer requested beyond offset
- * 
+ *
  * @return status of operation
  */
 static inline a_status_t
diff --git a/CORE/SERVICES/COMMON/adf/adf_net_types.h b/CORE/SERVICES/COMMON/adf/adf_net_types.h
index 544e266cc3d6..95428eb5596b 100644
--- a/CORE/SERVICES/COMMON/adf/adf_net_types.h
+++ b/CORE/SERVICES/COMMON/adf/adf_net_types.h
@@ -66,7 +66,7 @@ typedef enum {
 
 
 /**
- * @brief Indicates what features are supported by the interface. 
+ * @brief Indicates what features are supported by the interface.
  */
 #define ADF_NET_LINK_SUPP_10baseT_Half      (1 << 0)
 #define ADF_NET_LINK_SUPP_10baseT_Full      (1 << 1)
@@ -87,7 +87,7 @@ typedef enum {
                                            ADF_NET_LINK_SUPP_1000baseT_Full)
 
 /**
- * @brief Indicates what features are advertised by the interface. 
+ * @brief Indicates what features are advertised by the interface.
  */
 #define ADF_NET_LINK_ADV_10baseT_Half     (1 << 0)
 #define ADF_NET_LINK_ADV_10baseT_Full     (1 << 1)
@@ -240,10 +240,10 @@ typedef struct {
 	a_uint32_t	grec_src[1];
 } adf_net_igmpv3_grec_t;
 
-/** 
+/**
  * @brief IGMP version 3 specific datatypes
  */
-typedef struct { 
+typedef struct {
 	a_uint8_t               igmpv3_type;
 	a_uint8_t               igmpv3_resv1;
 	a_uint16_t              igmpv3_csum;
@@ -274,7 +274,7 @@ typedef struct adf_net_vlanhdr{
 typedef struct adf_net_vid{
 #if defined (ADF_LITTLE_ENDIAN_MACHINE)
     a_uint16_t      val:12;
-    a_uint8_t       res:4;  
+    a_uint8_t       res:4;
 #elif defined (ADF_BIG_ENDIAN_MACHINE)
     a_uint8_t      res:4;
     a_uint16_t      val:12;
@@ -398,7 +398,7 @@ typedef union {
 }adf_net_cmd_data_t;
 
 /**
- * @brief For polled devices, adf_drv responds with one of the following status in 
+ * @brief For polled devices, adf_drv responds with one of the following status in
  * its poll function.
  */
 typedef enum {
@@ -475,7 +475,7 @@ typedef enum adf_net_wireless_events{
     ADF_IEEE80211_SCAN = __ADF_IEEE80211_SCAN,
     ADF_IEEE80211_REPLAY = __ADF_IEEE80211_REPLAY,
     ADF_IEEE80211_MICHAEL = __ADF_IEEE80211_MICHAEL,
-    ADF_IEEE80211_REJOIN = __ADF_IEEE80211_REJOIN, 
+    ADF_IEEE80211_REJOIN = __ADF_IEEE80211_REJOIN,
     ADF_CUSTOM_PUSH_BUTTON = __ADF_CUSTOM_PUSH_BUTTON
 }adf_net_wireless_event_t;
 
@@ -562,7 +562,7 @@ typedef struct {
 					reserved:29;
 #else
 #error  "Please fix"
-#endif	
+#endif
 		} u_nd_advt;
 
 		struct {
@@ -598,12 +598,12 @@ typedef struct {
 #define adf_csum_ipv6(s, d, l, p, sum)			\
 	csum_ipv6_magic((struct in6_addr *)s,		\
 			(struct in6_addr *)d, l, p, sum)
-/** 
- * @brief 
- * 
+/**
+ * @brief
+ *
  * @param addr1
  * @param addr2
- * 
+ *
  * @return Compare two ethernet addresses, returns A_TRUE if equal
  *
  */
diff --git a/CORE/SERVICES/COMMON/adf/adf_os_atomic.h b/CORE/SERVICES/COMMON/adf/adf_os_atomic.h
index 79673d6f7072..4e386dc90953 100644
--- a/CORE/SERVICES/COMMON/adf/adf_os_atomic.h
+++ b/CORE/SERVICES/COMMON/adf/adf_os_atomic.h
@@ -27,12 +27,12 @@
 
 
 
-/** 
+/**
  * @ingroup adf_os_public
  * @file adf_os_atomic.h
  * This file abstracts an atomic counter.
  */
- 
+
 #ifndef _ADF_OS_ATOMIC_H
 #define _ADF_OS_ATOMIC_H
 
@@ -45,7 +45,7 @@
  */
 typedef __adf_os_atomic_t    adf_os_atomic_t;
 
-/** 
+/**
  * @brief Initialize an atomic type variable
  * @param[in] v a pointer to an opaque atomic variable
  */
diff --git a/CORE/SERVICES/COMMON/adf/adf_os_bitops.h b/CORE/SERVICES/COMMON/adf/adf_os_bitops.h
index e977c9367a64..42a64d797124 100644
--- a/CORE/SERVICES/COMMON/adf/adf_os_bitops.h
+++ b/CORE/SERVICES/COMMON/adf/adf_os_bitops.h
@@ -27,7 +27,7 @@
 
 
 
-/** 
+/**
  * @ingroup adf_os_public
  * @file adf_os_bitops.h
  * This file abstracts bit-level operations on a stream of bytes.
@@ -131,7 +131,7 @@ static inline void adf_os_change_bit(a_uint32_t nr, volatile a_uint32_t *addr)
  * Note that nr may be almost arbitrarily large; this function is not
  * restricted to acting on a single-word quantity.
  */
-static inline void adf_os_test_and_set_bit_a(a_uint32_t nr, 
+static inline void adf_os_test_and_set_bit_a(a_uint32_t nr,
                                           volatile a_uint32_t *addr)
 {
     __adf_os_test_and_set_bit_a(nr, addr);
@@ -146,7 +146,7 @@ static inline void adf_os_test_and_set_bit_a(a_uint32_t nr,
  * Note that nr may be almost arbitrarily large; this function is not
  * restricted to acting on a single-word quantity.
  */
-static inline void adf_os_test_and_set_bit(a_uint32_t nr, 
+static inline void adf_os_test_and_set_bit(a_uint32_t nr,
                                           volatile a_uint32_t *addr)
 {
     __adf_os_test_and_set_bit(nr, addr);
@@ -161,7 +161,7 @@ static inline void adf_os_test_and_set_bit(a_uint32_t nr,
  * Note that nr may be almost arbitrarily large; this function is not
  * restricted to acting on a single-word quantity.
  */
-static inline void adf_os_test_and_clear_bit_a(a_uint32_t nr, 
+static inline void adf_os_test_and_clear_bit_a(a_uint32_t nr,
                                           volatile a_uint32_t *addr)
 {
     __adf_os_test_and_clear_bit_a(nr, addr);
@@ -176,7 +176,7 @@ static inline void adf_os_test_and_clear_bit_a(a_uint32_t nr,
  * Note that nr may be almost arbitrarily large; this function is not
  * restricted to acting on a single-word quantity.
  */
-static inline void adf_os_test_and_clear_bit(a_uint32_t nr, 
+static inline void adf_os_test_and_clear_bit(a_uint32_t nr,
                                           volatile a_uint32_t *addr)
 {
     __adf_os_test_and_clear_bit(nr, addr);
@@ -191,7 +191,7 @@ static inline void adf_os_test_and_clear_bit(a_uint32_t nr,
  * Note that nr may be almost arbitrarily large; this function is not
  * restricted to acting on a single-word quantity.
  */
-static inline void adf_os_test_and_change_bit_a(a_uint32_t nr, 
+static inline void adf_os_test_and_change_bit_a(a_uint32_t nr,
                                           volatile a_uint32_t *addr)
 {
     __adf_os_test_and_change_bit_a(nr, addr);
@@ -206,7 +206,7 @@ static inline void adf_os_test_and_change_bit_a(a_uint32_t nr,
  * Note that nr may be almost arbitrarily large; this function is not
  * restricted to acting on a single-word quantity.
  */
-static inline void adf_os_test_and_change_bit(a_uint32_t nr, 
+static inline void adf_os_test_and_change_bit(a_uint32_t nr,
                                           volatile a_uint32_t *addr)
 {
     __adf_os_test_and_change_bit(nr, addr);
diff --git a/CORE/SERVICES/COMMON/adf/adf_os_defer.h b/CORE/SERVICES/COMMON/adf/adf_os_defer.h
index ba0c7f8b426e..2ec5635c0758 100644
--- a/CORE/SERVICES/COMMON/adf/adf_os_defer.h
+++ b/CORE/SERVICES/COMMON/adf/adf_os_defer.h
@@ -41,38 +41,38 @@
 
 /**
  * TODO This implements work queues (worker threads, kernel threads etc.).
- * Note that there is no cancel on a scheduled work. You cannot free a work 
+ * Note that there is no cancel on a scheduled work. You cannot free a work
  * item if its queued. You cannot know if a work item is queued or not unless
  * its running, whence you know its not queued.
  *
  * so if, say, a module is asked to unload itself, how exactly will it make
- * sure that the work's not queued, for OS'es that dont provide such a 
+ * sure that the work's not queued, for OS'es that dont provide such a
  * mechanism??
  */
 
 /**
  * @brief Representation of a work queue.
- */ 
+ */
 typedef __adf_os_work_t     adf_os_work_t;
 typedef __adf_os_delayed_work_t adf_os_delayed_work_t;
 typedef __adf_os_workqueue_t     adf_os_workqueue_t;
 /**
  * @brief Representation of a bottom half.
- */ 
+ */
 typedef __adf_os_bh_t       adf_os_bh_t;
 
 
 
 /**
  * @brief This creates the Bottom half deferred handler
- * 
+ *
  * @param[in] hdl   OS handle
  * @param[in] bh    bottom instance
  * @param[in] func  deferred function to run at bottom half interrupt
  *                  context.
  * @param[in] arg   argument for the deferred function
  */
-static inline void 
+static inline void
 adf_os_create_bh(adf_os_handle_t  hdl, adf_os_bh_t  *bh,
                  adf_os_defer_fn_t  func,void  *arg)
 {
@@ -82,11 +82,11 @@ adf_os_create_bh(adf_os_handle_t  hdl, adf_os_bh_t  *bh,
 
 /**
  * @brief schedule a bottom half (DPC)
- * 
+ *
  * @param[in] hdl   OS handle
  * @param[in] bh    bottom instance
  */
-static inline void 
+static inline void
 adf_os_sched_bh(adf_os_handle_t hdl, adf_os_bh_t *bh)
 {
     __adf_os_sched_bh(hdl, bh);
@@ -94,11 +94,11 @@ adf_os_sched_bh(adf_os_handle_t hdl, adf_os_bh_t *bh)
 
 /**
  * @brief destroy the bh (synchronous)
- * 
+ *
  * @param[in] hdl   OS handle
  * @param[in] bh    bottom instance
  */
-static inline void 
+static inline void
 adf_os_destroy_bh(adf_os_handle_t hdl, adf_os_bh_t *bh)
 {
     __adf_os_disable_bh(hdl,bh);
@@ -109,21 +109,21 @@ adf_os_destroy_bh(adf_os_handle_t hdl, adf_os_bh_t *bh)
 /**
  * @brief create a work/task queue, This runs in non-interrupt
  *        context, so can be preempted by H/W & S/W intr
- * 
+ *
  * @param[in] hdl   OS handle
  * @param[in] work  work instance
  * @param[in] func  deferred function to run at bottom half non-interrupt
  *                  context.
  * @param[in] arg   argument for the deferred function
  */
-static inline void 
+static inline void
 adf_os_create_work(adf_os_handle_t hdl, adf_os_work_t  *work,
                  adf_os_defer_fn_t  func, void  *arg)
 {
     __adf_os_init_work(hdl, work, func, arg);
 }
 
-static inline void 
+static inline void
 adf_os_create_delayed_work(adf_os_handle_t hdl, adf_os_delayed_work_t  *work,
                  adf_os_defer_fn_t  func, void  *arg)
 {
@@ -142,19 +142,19 @@ adf_os_queue_work(adf_os_handle_t hdl, adf_os_workqueue_t *wqueue, adf_os_work_t
    return  __adf_os_queue_work(hdl, wqueue, work);
 }
 
-static inline void 
+static inline void
 adf_os_queue_delayed_work(adf_os_handle_t hdl, adf_os_workqueue_t *wqueue, adf_os_delayed_work_t* work, a_uint32_t delay)
 {
    return  __adf_os_queue_delayed_work(hdl, wqueue, work, delay);
 }
 
-static inline void 
+static inline void
 adf_os_flush_workqueue(adf_os_handle_t hdl, adf_os_workqueue_t *wqueue)
 {
    return  __adf_os_flush_workqueue(hdl, wqueue);
 }
 
-static inline void 
+static inline void
 adf_os_destroy_workqueue(adf_os_handle_t hdl, adf_os_workqueue_t *wqueue)
 {
    return  __adf_os_destroy_workqueue(hdl, wqueue);
@@ -162,11 +162,11 @@ adf_os_destroy_workqueue(adf_os_handle_t hdl, adf_os_workqueue_t *wqueue)
 
 /**
  * @brief Schedule a deferred task on non-interrupt context
- * 
+ *
  * @param[in] hdl   OS handle
  * @param[in] work  work instance
  */
-static inline void 
+static inline void
 adf_os_sched_work(adf_os_handle_t  hdl, adf_os_work_t   *work)
 {
     __adf_os_sched_work(hdl, work);
@@ -178,8 +178,8 @@ adf_os_sched_work(adf_os_handle_t  hdl, adf_os_work_t   *work)
  *@param[in] hdl    OS handle
  *@param[in] work   work instance
  */
-static inline void 
-adf_os_destroy_work(adf_os_handle_t hdl, adf_os_work_t *work) 
+static inline void
+adf_os_destroy_work(adf_os_handle_t hdl, adf_os_work_t *work)
 {
     __adf_os_disable_work(hdl, work);
 }
diff --git a/CORE/SERVICES/COMMON/adf/adf_os_dma.h b/CORE/SERVICES/COMMON/adf/adf_os_dma.h
index 4f961ac6e39f..a1d51f447590 100644
--- a/CORE/SERVICES/COMMON/adf/adf_os_dma.h
+++ b/CORE/SERVICES/COMMON/adf/adf_os_dma.h
@@ -49,13 +49,13 @@
  * @param[in]  size      DMA buffer size
  * @param[in]  coherent  0 => cached.
  * @param[out] dmap      opaque coherent memory handle
- * 
+ *
  * @return     returns the virtual address of the memory
  */
 static inline void *
-adf_os_dmamem_alloc(adf_os_device_t     osdev, 
-                    adf_os_size_t       size, 
-                    a_bool_t            coherent, 
+adf_os_dmamem_alloc(adf_os_device_t     osdev,
+                    adf_os_size_t       size,
+                    a_bool_t            coherent,
                     adf_os_dma_map_t   *dmap)
 {
     return __adf_os_dmamem_alloc(osdev, size, coherent, dmap);
@@ -63,7 +63,7 @@ adf_os_dmamem_alloc(adf_os_device_t     osdev,
 
 /**
  * @brief Free a previously mapped DMA buffer
- * 
+ *
  * @param[in] osdev     platform device instance
  * @param[in] size      DMA buffer size
  * @param[in] coherent  0 => cached.
@@ -97,12 +97,12 @@ adf_os_dmamem_map2addr(adf_os_dma_map_t dmap)
  * @brief Flush and invalidate cache for a given dmamem map
  *
  * @param[in] osdev     platform device instance
- * @param[in] dmap 		mem handle
+ * @param[in] dmap		mem handle
  * @param[in] op        op code for sync type, (see @ref adf_os_types.h)
  */
 static inline void
-adf_os_dmamem_cache_sync(adf_os_device_t      osdev, 
-                         adf_os_dma_map_t     dmap, 
+adf_os_dmamem_cache_sync(adf_os_device_t      osdev,
+                         adf_os_dma_map_t     dmap,
                          adf_os_cache_sync_t  op)
 {
     __adf_os_dmamem_cache_sync(osdev, dmap, op);
@@ -110,7 +110,7 @@ adf_os_dmamem_cache_sync(adf_os_device_t      osdev,
 
 /**
  * @brief Get the cpu cache line size
- * 
+ *
  * @return The CPU cache line size in bytes.
  */
 static inline adf_os_size_t
diff --git a/CORE/SERVICES/COMMON/adf/adf_os_lock.h b/CORE/SERVICES/COMMON/adf/adf_os_lock.h
index 6a1077e49e5d..9e0a733e36ad 100644
--- a/CORE/SERVICES/COMMON/adf/adf_os_lock.h
+++ b/CORE/SERVICES/COMMON/adf/adf_os_lock.h
@@ -119,7 +119,7 @@ adf_os_spinlock_destroy(adf_os_spinlock_t *lock)
 
 /**
  * @brief locks the spinlock mutex in soft irq context
- * 
+ *
  * @param[in] lock  spinlock object pointer
  */
 static inline void
@@ -132,7 +132,7 @@ void adf_os_spin_lock_bh_outline(adf_os_spinlock_t *lock);
 
 /**
  * @brief unlocks the spinlock mutex in soft irq context
- * 
+ *
  * @param[in] lock  spinlock object pointer
  */
 static inline void
@@ -150,7 +150,7 @@ void adf_os_spin_unlock_bh_outline(adf_os_spinlock_t *lock);
  * @param[in] lock      spinlock to be held for the critical region
  * @param[in] func      critical region function that to be executed
  * @param[in] context   context of the critical region function
- * 
+ *
  * @return Boolean status returned by the critical region function
  */
 static inline a_bool_t
@@ -164,9 +164,9 @@ adf_os_spinlock_irq_exec(adf_os_handle_t           hdl,
 
 /**
  * @brief locks the spinlock in irq context
- * 
+ *
  * @param[in] lock  spinlock object pointer
- * @param[in] flags flags value 
+ * @param[in] flags flags value
  *
  */
 #define adf_os_spin_lock_irq(_pLock, _flags)   __adf_os_spin_lock_irq(_pLock, _flags)
diff --git a/CORE/SERVICES/COMMON/adf/adf_os_mem.h b/CORE/SERVICES/COMMON/adf/adf_os_mem.h
index 215e1b6e5de0..cdb969a67f48 100644
--- a/CORE/SERVICES/COMMON/adf/adf_os_mem.h
+++ b/CORE/SERVICES/COMMON/adf/adf_os_mem.h
@@ -105,7 +105,7 @@ adf_os_mem_copy(void *dst, const void *src, adf_os_size_t size)
  * @param[in] src     source address
  * @param[in] size    buffer size
  */
-static inline void 
+static inline void
 adf_os_mem_move(void *dst, void *src, adf_os_size_t size)
 {
 	__adf_os_mem_move(dst,src,size);
@@ -114,7 +114,7 @@ adf_os_mem_move(void *dst, void *src, adf_os_size_t size)
 
 /**
  * @brief Fill a memory buffer
- * 
+ *
  * @param[in] buf   buffer to be filled
  * @param[in] b     byte to fill
  * @param[in] size  buffer size
@@ -128,7 +128,7 @@ adf_os_mem_set(void *buf, a_uint8_t b, adf_os_size_t size)
 
 /**
  * @brief Zero a memory buffer
- * 
+ *
  * @param[in] buf   buffer to be zeroed
  * @param[in] size  buffer size
  */
diff --git a/CORE/SERVICES/COMMON/adf/adf_os_module.h b/CORE/SERVICES/COMMON/adf/adf_os_module.h
index edf964d0c0b3..a67a9d678d77 100644
--- a/CORE/SERVICES/COMMON/adf/adf_os_module.h
+++ b/CORE/SERVICES/COMMON/adf/adf_os_module.h
@@ -42,63 +42,63 @@ typedef a_status_t (*module_init_func_t)(void);
 
 /**
  * @brief Specify the module's entry point.
- */ 
+ */
 #define adf_os_virt_module_init(_mod_init_func)  __adf_os_virt_module_init(_mod_init_func)
 
 /**
  * @brief Specify the module's exit point.
- */ 
+ */
 #define adf_os_virt_module_exit(_mod_exit_func)  __adf_os_virt_module_exit(_mod_exit_func)
 
 /**
  * @brief Specify the module's name.
- */ 
+ */
 #define adf_os_virt_module_name(_name)      __adf_os_virt_module_name(_name)
 
 /**
  * @brief Specify the module's dependency on another module.
- */ 
+ */
 #define adf_os_module_dep(_name,_dep)       __adf_os_module_dep(_name,_dep)
 /**
  * @brief Module parameter of type char
- */ 
+ */
 #define ADF_OS_PARAM_TYPE_INT8             __ADF_OS_PARAM_TYPE_INT8
 
 /**
  * @brief Module parameter of type unsigned char
- */ 
+ */
 #define ADF_OS_PARAM_TYPE_UINT8            __ADF_OS_PARAM_TYPE_UINT8
 /**
  * @brief Module parameter of type short
- */ 
+ */
 #define ADF_OS_PARAM_TYPE_INT16             __ADF_OS_PARAM_TYPE_INT16
 
 /**
  * @brief Module parameter of type unsigned short
- */ 
+ */
 #define ADF_OS_PARAM_TYPE_UINT16            __ADF_OS_PARAM_TYPE_UINT16
 
 /**
  * @brief Module parameter of type integer.
- */ 
+ */
 #define ADF_OS_PARAM_TYPE_INT32             __ADF_OS_PARAM_TYPE_INT32
 
 /**
  * @brief Module parameter of type unsigned integer.
- */ 
+ */
 #define ADF_OS_PARAM_TYPE_UINT32            __ADF_OS_PARAM_TYPE_UINT32
 
 /**
  * @brief Module parameter of type string.
- */ 
+ */
 #define ADF_OS_PARAM_TYPE_STRING            __ADF_OS_PARAM_TYPE_STRING
 
 /**
  * @brief Export a symbol from a module.
- */ 
+ */
 #define adf_os_export_symbol(_sym)         __adf_os_export_symbol(_sym)
 /**
- * @brief Declare a module parameter. 
+ * @brief Declare a module parameter.
 
  */
 #define adf_os_declare_param(name, type) __adf_os_declare_param(name, type)
diff --git a/CORE/SERVICES/COMMON/adf/adf_os_stdtypes.h b/CORE/SERVICES/COMMON/adf/adf_os_stdtypes.h
index 237a5f22458e..a4f07ead473f 100644
--- a/CORE/SERVICES/COMMON/adf/adf_os_stdtypes.h
+++ b/CORE/SERVICES/COMMON/adf/adf_os_stdtypes.h
@@ -28,7 +28,7 @@
 
 /**
  * @defgroup adf_os_public OS abstraction API
- */ 
+ */
 
 /**
  * @ingroup adf_os_public
diff --git a/CORE/SERVICES/COMMON/adf/adf_os_time.h b/CORE/SERVICES/COMMON/adf/adf_os_time.h
index ccab47cdec2b..4cf7e8bab28f 100644
--- a/CORE/SERVICES/COMMON/adf/adf_os_time.h
+++ b/CORE/SERVICES/COMMON/adf/adf_os_time.h
@@ -42,7 +42,7 @@ typedef __adf_time_t   adf_os_time_t;
 /**
  * @brief count the number of ticks elapsed from the time when
  *        the system booted
- * 
+ *
  * @return ticks
  */
 static inline unsigned long
@@ -56,7 +56,7 @@ adf_os_ticks(void)
  *
  * @param[in] ticks number of ticks
  * @return time in milliseconds
- */ 
+ */
 static inline a_uint32_t
 adf_os_ticks_to_msecs(unsigned long clock_ticks)
 {
@@ -68,7 +68,7 @@ adf_os_ticks_to_msecs(unsigned long clock_ticks)
  *
  * @param[in] time in milliseconds
  * @return number of ticks
- */ 
+ */
 static inline unsigned long
 adf_os_msecs_to_ticks(a_uint32_t msecs)
 {
@@ -117,19 +117,17 @@ adf_os_mdelay(int msecs)
 
 /**
  * @brief Check if _a is later than _b.
- */ 
+ */
 #define adf_os_time_after(_a, _b)       __adf_os_time_after(_a, _b)
 
 /**
  * @brief Check if _a is prior to _b.
- */ 
+ */
 #define adf_os_time_before(_a, _b)      __adf_os_time_before(_a, _b)
 
 /**
  * @brief Check if _a atleast as recent as _b, if not later.
- */ 
+ */
 #define adf_os_time_after_eq(_a, _b)    __adf_os_time_after_eq(_a, _b)
 
 #endif
-    
-
diff --git a/CORE/SERVICES/COMMON/adf/adf_os_timer.h b/CORE/SERVICES/COMMON/adf/adf_os_timer.h
index b683950f9a4d..0a0088ee4775 100644
--- a/CORE/SERVICES/COMMON/adf/adf_os_timer.h
+++ b/CORE/SERVICES/COMMON/adf/adf_os_timer.h
@@ -48,7 +48,7 @@ typedef __adf_os_timer_t           adf_os_timer_t;
 
 /**
  * @brief Initialize a timer
- * 
+ *
  * @param[in] hdl       OS handle
  * @param[in] timer     timer object pointer
  * @param[in] func      timer function
@@ -65,7 +65,7 @@ adf_os_timer_init(adf_os_handle_t      hdl,
 
 /**
  * @brief Start a one-shot timer
- * 
+ *
  * @param[in] timer     timer object pointer
  * @param[in] msec      expiration period in milliseconds
  */
@@ -77,7 +77,7 @@ adf_os_timer_start(adf_os_timer_t *timer, int msec)
 
 /**
  * @brief Modify existing timer to new timeout value
- * 
+ *
  * @param[in] timer     timer object pointer
  * @param[in] msec      expiration period in milliseconds
  */
@@ -92,7 +92,7 @@ adf_os_timer_mod(adf_os_timer_t *timer, int msec)
  * The function will return after any running timer completes.
  *
  * @param[in] timer     timer object pointer
- * 
+ *
  * @retval    TRUE      timer was cancelled and deactived
  * @retval    FALSE     timer was cancelled but already got fired.
  */
@@ -107,7 +107,7 @@ adf_os_timer_cancel(adf_os_timer_t *timer)
  * The function will return after any running timer completes.
  *
  * @param[in] timer     timer object pointer
- * 
+ *
  */
 static inline void
 adf_os_timer_free(adf_os_timer_t *timer)
@@ -116,4 +116,3 @@ adf_os_timer_free(adf_os_timer_t *timer)
 }
 
 #endif
-
diff --git a/CORE/SERVICES/COMMON/adf/adf_os_types.h b/CORE/SERVICES/COMMON/adf/adf_os_types.h
index bcdfe1a1dbde..5882ef082e38 100644
--- a/CORE/SERVICES/COMMON/adf/adf_os_types.h
+++ b/CORE/SERVICES/COMMON/adf/adf_os_types.h
@@ -41,7 +41,7 @@
 
 #ifndef __ahdecl
 #ifdef __i386__
-#define __ahdecl   __attribute__((regparm(0))) 
+#define __ahdecl   __attribute__((regparm(0)))
 #else
 #define __ahdecl
 #endif
@@ -50,12 +50,12 @@
 #define ADF_OS_MAX_SCATTER  __ADF_OS_MAX_SCATTER
 /**
  * @brief Max number of scatter-gather segments.
- */ 
+ */
 #define ADF_OS_MAX_SGLIST   4
 
 /**
  * @brief denotes structure is packed.
- */ 
+ */
 #define adf_os_packed __adf_os_packed
 
 /**
@@ -90,39 +90,39 @@ typedef __adf_os_off_t      adf_os_off_t;
 
 /**
  * @brief DMA mapping object.
- */ 
+ */
 typedef __adf_os_dma_map_t  adf_os_dma_map_t;
 
 /**
  * @brief DMA address.
- */ 
+ */
 typedef __adf_os_dma_addr_t     adf_os_dma_addr_t;
 
 /**
  * @brief DMA size.
- */ 
+ */
 typedef __adf_os_dma_size_t     adf_os_dma_size_t;
 
 /**
  * @brief DMA context.
- */ 
+ */
 typedef __adf_os_dma_context_t  adf_os_dma_context_t;
 
 /**
  * @brief Information inside a DMA map.
- */ 
+ */
 typedef struct adf_os_dmamap_info{
     a_uint32_t                  nsegs;      /**< total number mapped segments*/
     struct __dma_segs{
         adf_os_dma_addr_t       paddr;      /**< physical(dma'able) address of the segment*/
         adf_os_dma_size_t       len;        /**< length of the segment*/
-    } dma_segs[ADF_OS_MAX_SCATTER]; 
+    } dma_segs[ADF_OS_MAX_SCATTER];
 
 }adf_os_dmamap_info_t;
 
 /**
  * @brief Representation of a scatter-gather list.
- */ 
+ */
 typedef struct adf_os_sglist{
     a_uint32_t                  nsegs;      /**< total number of segments*/
     struct __sg_segs{
@@ -142,7 +142,7 @@ typedef struct adf_os_sglist{
  *  operations, where reading a network packet or
  *  storage sector corresponds to a read operation in
  *  bus_dma.
- * 
+ *
  *  ADF_SYNC_PREREAD       Perform any synchronization
  *                         required prior to an update
  *                         of host memory by the DMA
@@ -173,7 +173,7 @@ typedef enum adf_os_cache_sync{
  * @brief Generic status to be used by adf_drv.
  */
 /**
- * @brief An ecore needs to provide a table of all pci device/vendor id's it 
+ * @brief An ecore needs to provide a table of all pci device/vendor id's it
  * supports
  *
  * This table should be terminated by a NULL entry , i.e. {0}
@@ -207,7 +207,7 @@ typedef enum {
 
 /**
  * @brief Representation of a h/w resource.
- */ 
+ */
 typedef struct {
     a_uint64_t             start;
     a_uint64_t             end;
@@ -218,7 +218,7 @@ typedef struct {
 
 /**
  * @brief Representation of bus registration data.
- */ 
+ */
 typedef union {
     adf_os_pci_dev_id_t  *pci;
     void              *raw;
@@ -226,7 +226,7 @@ typedef union {
 
 /**
  * @brief Representation of data required for attach.
- */ 
+ */
 typedef union {
     adf_os_pci_dev_id_t pci;
     void *raw;
@@ -236,7 +236,7 @@ typedef union {
 
 /**
  * @brief Types of buses.
- */ 
+ */
 typedef enum {
     ADF_OS_BUS_TYPE_PCI = 1,
     ADF_OS_BUS_TYPE_GENERIC,
@@ -244,7 +244,7 @@ typedef enum {
 
 /**
  * @brief IRQ handler response codes.
- */ 
+ */
 typedef enum {
     ADF_OS_IRQ_NONE,
     ADF_OS_IRQ_HANDLED,
@@ -252,7 +252,7 @@ typedef enum {
 
 /**
  * @brief DMA mask types.
- */ 
+ */
 typedef enum {
     ADF_OS_DMA_MASK_32BIT,
     ADF_OS_DMA_MASK_64BIT,
@@ -265,8 +265,8 @@ typedef enum {
  *        ADF_OS_DMA_FROM_DEVICE (data going from memory to device)
  */
 typedef enum {
-    ADF_OS_DMA_TO_DEVICE = __ADF_OS_DMA_TO_DEVICE, 
-    ADF_OS_DMA_FROM_DEVICE = __ADF_OS_DMA_FROM_DEVICE, 
+    ADF_OS_DMA_TO_DEVICE = __ADF_OS_DMA_TO_DEVICE,
+    ADF_OS_DMA_FROM_DEVICE = __ADF_OS_DMA_FROM_DEVICE,
 } adf_os_dma_dir_t;
 
 /*
@@ -293,12 +293,12 @@ typedef void (*adf_os_timer_func_t)(void *);
 
 /**
  * @brief Prototype of IRQ function.
- */ 
-typedef adf_os_irq_resp_t (*adf_os_drv_intr)(adf_drv_handle_t hdl);                  
+ */
+typedef adf_os_irq_resp_t (*adf_os_drv_intr)(adf_drv_handle_t hdl);
 
 /**
  * @brief The OS print routine.
- */ 
+ */
 #define adf_os_print         __adf_os_print
 #define adf_os_vprint        __adf_os_vprint
 #define adf_os_snprint       __adf_os_snprint
@@ -312,8 +312,8 @@ typedef struct _adf_drv_info{
     /**
      * @brief driver specific functions
      */
-    adf_drv_handle_t (*drv_attach)  (adf_os_resource_t *res, int count, 
-                                     adf_os_attach_data_t *data, 
+    adf_drv_handle_t (*drv_attach)  (adf_os_resource_t *res, int count,
+                                     adf_os_attach_data_t *data,
                                      adf_os_device_t osdev);
     void       (*drv_detach)  (adf_drv_handle_t hdl);
     void       (*drv_suspend) (adf_drv_handle_t hdl, adf_os_pm_t pm);
diff --git a/CORE/SERVICES/COMMON/adf/adf_os_util.h b/CORE/SERVICES/COMMON/adf/adf_os_util.h
index 97b63ab6a6f8..23110e3cef51 100644
--- a/CORE/SERVICES/COMMON/adf/adf_os_util.h
+++ b/CORE/SERVICES/COMMON/adf/adf_os_util.h
@@ -48,33 +48,33 @@
 #define adf_os_likely(_expr)       __adf_os_likely(_expr)
 
 /**
- * @brief read memory barrier. 
+ * @brief read memory barrier.
  */
 #define adf_os_wmb()                __adf_os_wmb()
 
 /**
- * @brief write memory barrier. 
+ * @brief write memory barrier.
  */
 #define adf_os_rmb()                __adf_os_rmb()
 
 /**
- * @brief read + write memory barrier. 
+ * @brief read + write memory barrier.
  */
 #define adf_os_mb()                 __adf_os_mb()
 
 /**
  * @brief return the lesser of a, b
- */ 
+ */
 #define adf_os_min(_a, _b)          __adf_os_min(_a, _b)
 
 /**
  * @brief return the larger of a, b
- */ 
+ */
 #define adf_os_max(_a, _b)          __adf_os_max(_a, _b)
 
 /**
  * @brief assert "expr" evaluates to false.
- */ 
+ */
 #ifdef ADF_OS_DEBUG
 #define adf_os_assert(expr)         __adf_os_assert(expr)
 #else
@@ -93,8 +93,8 @@
 /**
  * @brief supply pseudo-random numbers
  */
-static inline void adf_os_get_rand(adf_os_handle_t  hdl, 
-                                   a_uint8_t       *ptr, 
+static inline void adf_os_get_rand(adf_os_handle_t  hdl,
+                                   a_uint8_t       *ptr,
                                    a_uint32_t       len)
 {
     __adf_os_get_rand(hdl, ptr, len);
@@ -118,14 +118,14 @@ static inline void adf_os_get_rand(adf_os_handle_t  hdl,
  * @brief return square root
  */
 
-/** 
+/**
  * @brief  Math function for getting a square root
- * 
+ *
  * @param[in] x     Number to compute the sqaure root
- * 
+ *
  * @return  Sqaure root as integer
  */
-static adf_os_inline a_uint32_t 
+static adf_os_inline a_uint32_t
 adf_os_int_sqrt(a_uint32_t x)
 {
 	return __adf_os_int_sqrt(x);
diff --git a/CORE/SERVICES/COMMON/adf/linux/adf_nbuf_pvt.h b/CORE/SERVICES/COMMON/adf/linux/adf_nbuf_pvt.h
index 41eae816a8d6..d7e18d5db2bb 100644
--- a/CORE/SERVICES/COMMON/adf/linux/adf_nbuf_pvt.h
+++ b/CORE/SERVICES/COMMON/adf/linux/adf_nbuf_pvt.h
@@ -214,9 +214,9 @@ __adf_nbuf_t    __adf_nbuf_alloc(__adf_os_device_t osdev, size_t size, int reser
 void            __adf_nbuf_free (struct sk_buff *skb);
 void            __adf_nbuf_ref (struct sk_buff *skb);
 int             __adf_nbuf_shared (struct sk_buff *skb);
-a_status_t      __adf_nbuf_dmamap_create(__adf_os_device_t osdev, 
+a_status_t      __adf_nbuf_dmamap_create(__adf_os_device_t osdev,
                                          __adf_os_dma_map_t *dmap);
-void            __adf_nbuf_dmamap_destroy(__adf_os_device_t osdev, 
+void            __adf_nbuf_dmamap_destroy(__adf_os_device_t osdev,
                                           __adf_os_dma_map_t dmap);
 a_status_t      __adf_nbuf_map(__adf_os_device_t osdev,
                     struct sk_buff *skb, adf_os_dma_dir_t dir);
@@ -251,14 +251,14 @@ __adf_os_to_status(signed int error)
  * @brief This keeps the skb shell intact expands the headroom
  *        in the data region. In case of failure the skb is
  *        released.
- * 
+ *
  * @param skb
  * @param headroom
- * 
+ *
  * @return skb or NULL
  */
 static inline struct sk_buff *
-__adf_nbuf_realloc_headroom(struct sk_buff *skb, uint32_t headroom) 
+__adf_nbuf_realloc_headroom(struct sk_buff *skb, uint32_t headroom)
 {
     if(pskb_expand_head(skb, headroom, 0, GFP_ATOMIC)){
         dev_kfree_skb_any(skb);
@@ -270,10 +270,10 @@ __adf_nbuf_realloc_headroom(struct sk_buff *skb, uint32_t headroom)
  * @brief This keeps the skb shell intact exapnds the tailroom
  *        in data region. In case of failure it releases the
  *        skb.
- * 
+ *
  * @param skb
  * @param tailroom
- * 
+ *
  * @return skb or NULL
  */
 static inline struct sk_buff *
@@ -290,9 +290,9 @@ __adf_nbuf_realloc_tailroom(struct sk_buff *skb, uint32_t tailroom)
 /**
  * @brief return the amount of valid data in the skb, If there
  *        are frags then it returns total length.
- * 
+ *
  * @param skb
- * 
+ *
  * @return size_t
  */
 static inline size_t
@@ -302,7 +302,7 @@ __adf_nbuf_len(struct sk_buff *skb)
 
     i = NBUF_NUM_EXTRA_FRAGS(skb);
     while (i-- > 0) {
-        extra_frag_len += NBUF_EXTRA_FRAG_LEN(skb, i); 
+        extra_frag_len += NBUF_EXTRA_FRAG_LEN(skb, i);
     }
     return (extra_frag_len + skb->len);
 }
@@ -334,7 +334,7 @@ __adf_nbuf_cat(struct sk_buff *dst, struct sk_buff *src)
         if (error) {
             return __adf_os_to_status(error);
         }
-    }  
+    }
     memcpy(skb_tail_pointer(dst), src->data, src->len);
 
     skb_put(dst, src->len);
@@ -414,7 +414,7 @@ __adf_nbuf_put_tail(struct sk_buff *skb, size_t size)
            dev_kfree_skb_any(skb);
            return NULL;
        }
-   }     
+   }
    return skb_put(skb, size);
 }
 
@@ -513,7 +513,7 @@ __adf_nbuf_get_priv(struct sk_buff *skb)
  * @brief This will return the header's addr & m_len
  */
 static inline void
-__adf_nbuf_peek_header(struct sk_buff *skb, uint8_t   **addr, 
+__adf_nbuf_peek_header(struct sk_buff *skb, uint8_t   **addr,
                        uint32_t    *len)
 {
     *addr = skb->data;
@@ -603,7 +603,7 @@ __adf_nbuf_peek_header(struct sk_buff *skb, uint8_t   **addr,
 
 /**
  * @brief initiallize the queue head
- * 
+ *
  * @param qhead
  */
 static inline a_status_t
@@ -618,12 +618,12 @@ __adf_nbuf_queue_init(__adf_nbuf_queue_t *qhead)
  * @brief add an skb in the tail of the queue. This is a
  *        lockless version, driver must acquire locks if it
  *        needs to synchronize
- * 
+ *
  * @param qhead
  * @param skb
  */
 static inline void
-__adf_nbuf_queue_add(__adf_nbuf_queue_t *qhead, 
+__adf_nbuf_queue_add(__adf_nbuf_queue_t *qhead,
                      struct sk_buff *skb)
 {
     skb->next = NULL;/*Nullify the next ptr*/
@@ -632,7 +632,7 @@ __adf_nbuf_queue_add(__adf_nbuf_queue_t *qhead,
         qhead->head = skb;
     else
         qhead->tail->next = skb;
-    
+
     qhead->tail = skb;
     qhead->qlen++;
 }
@@ -661,9 +661,9 @@ __adf_nbuf_queue_insert_head(__adf_nbuf_queue_t *qhead,
 /**
  * @brief remove a skb from the head of the queue, this is a
  *        lockless version. Driver should take care of the locks
- * 
+ *
  * @param qhead
- * 
+ *
  * @return skb or NULL
  */
 static inline struct sk_buff *
@@ -686,9 +686,9 @@ __adf_nbuf_queue_remove(__adf_nbuf_queue_t * qhead)
 }
 /**
  * @brief return the queue length
- * 
+ *
  * @param qhead
- * 
+ *
  * @return uint32_t
  */
 static inline uint32_t
@@ -698,12 +698,12 @@ __adf_nbuf_queue_len(__adf_nbuf_queue_t * qhead)
 }
 /**
  * @brief returns the first skb in the queue
- * 
+ *
  * @param qhead
- * 
+ *
  * @return (NULL if the Q is empty)
  */
-static inline struct sk_buff *   
+static inline struct sk_buff *
 __adf_nbuf_queue_first(__adf_nbuf_queue_t *qhead)
 {
     return qhead->head;
@@ -711,21 +711,21 @@ __adf_nbuf_queue_first(__adf_nbuf_queue_t *qhead)
 /**
  * @brief return the next skb from packet chain, remember the
  *        skb is still in the queue
- * 
+ *
  * @param buf (packet)
- * 
+ *
  * @return (NULL if no packets are there)
  */
-static inline struct sk_buff *   
+static inline struct sk_buff *
 __adf_nbuf_queue_next(struct sk_buff *skb)
 {
     return skb->next;
 }
 /**
  * @brief check if the queue is empty or not
- * 
+ *
  * @param qhead
- * 
+ *
  * @return a_bool_t
  */
 static inline a_bool_t
@@ -745,10 +745,10 @@ __adf_nbuf_is_queue_empty(__adf_nbuf_queue_t *qhead)
  * prototypes. Implemented in adf_nbuf_pvt.c
  */
 adf_nbuf_tx_cksum_t __adf_nbuf_get_tx_cksum(struct sk_buff *skb);
-a_status_t      __adf_nbuf_set_rx_cksum(struct sk_buff *skb, 
+a_status_t      __adf_nbuf_set_rx_cksum(struct sk_buff *skb,
                                         adf_nbuf_rx_cksum_t *cksum);
-a_status_t      __adf_nbuf_get_vlan_info(adf_net_handle_t hdl, 
-                                         struct sk_buff *skb, 
+a_status_t      __adf_nbuf_get_vlan_info(adf_net_handle_t hdl,
+                                         struct sk_buff *skb,
                                          adf_net_vlanhdr_t *vlan);
 a_uint8_t __adf_nbuf_get_tid(struct sk_buff *skb);
 void __adf_nbuf_set_tid(struct sk_buff *skb, a_uint8_t tid);
@@ -771,11 +771,11 @@ __adf_nbuf_pool_init(adf_net_handle_t anet)
 /**
  * @brief Expand both tailroom & headroom. In case of failure
  *        release the skb.
- * 
+ *
  * @param skb
  * @param headroom
  * @param tailroom
- * 
+ *
  * @return skb or NULL
  */
 static inline struct sk_buff *
@@ -796,25 +796,25 @@ __adf_nbuf_expand(struct sk_buff *skb, uint32_t headroom, uint32_t tailroom)
  * @param dst_nbuf (address of the cloned nbuf)
  *
  * @return status
- * 
+ *
  * @note if GFP_ATOMIC is overkill then we can check whether its
  *       called from interrupt context and then do it or else in
  *       normal case use GFP_KERNEL
  * @example     use "in_irq() || irqs_disabled()"
- * 
- * 
+ *
+ *
  */
 static inline struct sk_buff *
 __adf_nbuf_clone(struct sk_buff *skb)
-{   
+{
     return skb_clone(skb, GFP_ATOMIC);
 }
 /**
  * @brief returns a private copy of the skb, the skb returned is
  *        completely modifiable
- * 
+ *
  * @param skb
- * 
+ *
  * @return skb or NULL
  */
 static inline struct sk_buff *
@@ -827,7 +827,7 @@ __adf_nbuf_copy(struct sk_buff *skb)
 
 /***********************XXX: misc api's************************/
 static inline a_bool_t
-__adf_nbuf_tx_cksum_info(struct sk_buff *skb, uint8_t **hdr_off, 
+__adf_nbuf_tx_cksum_info(struct sk_buff *skb, uint8_t **hdr_off,
                          uint8_t **where)
 {
 //     if (skb->ip_summed == CHECKSUM_NONE)
@@ -861,7 +861,7 @@ __adf_nbuf_get_tso_info(struct sk_buff *skb, adf_nbuf_tso_t *tso)
     }
 
     tso->mss      = skb_shinfo(skb)->tso_size;
-*/  
+*/
 //     tso->hdr_off  = (uint8_t)(skb->h.raw - skb->data);
 //
 //     if (skb->protocol == ntohs(ETH_P_IP))
@@ -874,9 +874,9 @@ __adf_nbuf_get_tso_info(struct sk_buff *skb, adf_nbuf_tso_t *tso)
 
 /**
  * @brief return the pointer the skb's buffer
- * 
+ *
  * @param skb
- * 
+ *
  * @return uint8_t *
  */
 static inline uint8_t *
@@ -887,9 +887,9 @@ __adf_nbuf_head(struct sk_buff *skb)
 
 /**
  * @brief return the pointer to data header in the skb
- * 
+ *
  * @param skb
- * 
+ *
  * @return uint8_t *
  */
 static inline uint8_t *
@@ -900,9 +900,9 @@ __adf_nbuf_data(struct sk_buff *skb)
 
 /**
  * @brief return the priority value of the skb
- * 
+ *
  * @param skb
- * 
+ *
  * @return uint32_t
  */
 static inline uint32_t
@@ -913,9 +913,9 @@ __adf_nbuf_get_priority(struct sk_buff *skb)
 
 /**
  * @brief sets the priority value of the skb
- * 
+ *
  * @param skb, priority
- * 
+ *
  * @return void
  */
 static inline void
@@ -926,9 +926,9 @@ __adf_nbuf_set_priority(struct sk_buff *skb, uint32_t p)
 
 /**
  * @brief sets the next skb pointer of the current skb
- * 
+ *
  * @param skb and next_skb
- * 
+ *
  * @return void
  */
 static inline void
@@ -939,9 +939,9 @@ __adf_nbuf_set_next(struct sk_buff *skb, struct sk_buff *skb_next)
 
 /**
  * @brief return the next skb pointer of the current skb
- * 
+ *
  * @param skb - the current skb
- * 
+ *
  * @return the next skb pointed to by the current skb
  */
 static inline struct sk_buff *
@@ -953,9 +953,9 @@ __adf_nbuf_next(struct sk_buff *skb)
 /**
  * @brief sets the next skb pointer of the current skb. This fn is used to
  * link up extensions to the head skb. Does not handle linking to the head
- * 
+ *
  * @param skb and next_skb
- * 
+ *
  * @return void
  */
 static inline void
@@ -966,9 +966,9 @@ __adf_nbuf_set_next_ext(struct sk_buff *skb, struct sk_buff *skb_next)
 
 /**
  * @brief return the next skb pointer of the current skb
- * 
+ *
  * @param skb - the current skb
- * 
+ *
  * @return the next skb pointed to by the current skb
  */
 static inline struct sk_buff *
@@ -988,13 +988,13 @@ __adf_nbuf_next_ext(struct sk_buff *skb)
  */
 static inline void
 __adf_nbuf_append_ext_list(
-        struct sk_buff *skb_head, 
-        struct sk_buff * ext_list, 
+        struct sk_buff *skb_head,
+        struct sk_buff * ext_list,
         size_t ext_len)
 {
         skb_shinfo(skb_head)->frag_list = ext_list;
         skb_head->data_len = ext_len;
-        skb_head->len += skb_head->data_len;      
+        skb_head->len += skb_head->data_len;
 }
 
 static inline void
@@ -1009,9 +1009,9 @@ __adf_nbuf_tx_free(struct sk_buff *bufs, int tx_err)
 
 /**
  * @brief return the checksum value of the skb
- * 
+ *
  * @param skb
- * 
+ *
  * @return uint32_t
  */
 static inline uint32_t
@@ -1022,9 +1022,9 @@ __adf_nbuf_get_age(struct sk_buff *skb)
 
 /**
  * @brief sets the checksum value of the skb
- * 
+ *
  * @param skb, value
- * 
+ *
  * @return void
  */
 static inline void
@@ -1035,9 +1035,9 @@ __adf_nbuf_set_age(struct sk_buff *skb, uint32_t v)
 
 /**
  * @brief adjusts the checksum/age value of the skb
- * 
+ *
  * @param skb, adj
- * 
+ *
  * @return void
  */
 static inline void
@@ -1048,9 +1048,9 @@ __adf_nbuf_adj_age(struct sk_buff *skb, uint32_t adj)
 
 /**
  * @brief return the length of the copy bits for skb
- * 
+ *
  * @param skb, offset, len, to
- * 
+ *
  * @return int32_t
  */
 static inline int32_t
@@ -1061,9 +1061,9 @@ __adf_nbuf_copy_bits(struct sk_buff *skb, int32_t offset, int32_t len, void *to)
 
 /**
  * @brief sets the length of the skb and adjust the tail
- * 
+ *
  * @param skb, length
- * 
+ *
  * @return void
  */
 static inline void
@@ -1075,22 +1075,22 @@ __adf_nbuf_set_pktlen(struct sk_buff *skb, uint32_t len)
     else {
         if (skb_tailroom(skb) < len - skb->len) {
             if(unlikely(pskb_expand_head(
-                            skb, 0, len - skb->len -skb_tailroom(skb), GFP_ATOMIC))) 
+                            skb, 0, len - skb->len -skb_tailroom(skb), GFP_ATOMIC)))
             {
                 dev_kfree_skb_any(skb);
                 //KASSERT(0, ("No enough tailroom for skb, failed to alloc"));
                 adf_os_assert(0);
             }
-        }     
+        }
         skb_put(skb, (len - skb->len));
     }
 }
 
 /**
  * @brief sets the protocol value of the skb
- * 
+ *
  * @param skb, protocol
- * 
+ *
  * @return void
  */
 static inline void
@@ -1113,10 +1113,10 @@ __adf_nbuf_is_nonlinear(struct sk_buff *skb)
 }
 
 /**
- * @brief zeros out cb 
- * 
+ * @brief zeros out cb
+ *
  * @param nbuf
- * 
+ *
  * @return void
  */
 static inline void
@@ -1127,12 +1127,12 @@ __adf_nbuf_reset_ctxt(__adf_nbuf_t nbuf)
 
 /**
  * @brief This function peeks data into the buffer at given offset
- * 
+ *
  * @param[in] buf   buffer
  * @param[out] data  peeked output buffer
  * @param[in] off   offset
  * @param[in] len   length of buffer requested beyond offset
- * 
+ *
  * @return status of operation
  */
 static inline a_status_t
diff --git a/CORE/SERVICES/COMMON/adf/linux/adf_os_defer_pvt.c b/CORE/SERVICES/COMMON/adf/linux/adf_os_defer_pvt.c
index 64ae8e3fc456..65dd5e8d1399 100644
--- a/CORE/SERVICES/COMMON/adf/linux/adf_os_defer_pvt.c
+++ b/CORE/SERVICES/COMMON/adf/linux/adf_os_defer_pvt.c
@@ -33,7 +33,7 @@
 
 #include "adf_os_defer_pvt.h"
 
-void 
+void
 __adf_os_defer_func(struct work_struct *work)
 {
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,19)
@@ -49,7 +49,7 @@ __adf_os_defer_func(struct work_struct *work)
 #endif
 }
 
-void 
+void
 __adf_os_defer_delayed_func(struct work_struct *dwork)
 {
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,19)
@@ -67,4 +67,3 @@ __adf_os_defer_delayed_func(struct work_struct *dwork)
 }
 EXPORT_SYMBOL(__adf_os_defer_func);
 EXPORT_SYMBOL(__adf_os_defer_delayed_func);
-
diff --git a/CORE/SERVICES/COMMON/adf/linux/adf_os_defer_pvt.h b/CORE/SERVICES/COMMON/adf/linux/adf_os_defer_pvt.h
index a022244006a2..0aedd7727038 100644
--- a/CORE/SERVICES/COMMON/adf/linux/adf_os_defer_pvt.h
+++ b/CORE/SERVICES/COMMON/adf/linux/adf_os_defer_pvt.h
@@ -63,7 +63,7 @@ extern void __adf_os_defer_delayed_func(struct work_struct *work);
 
 typedef void (*__adf_os_bh_fn_t)(unsigned long arg);
 
-static inline a_status_t 
+static inline a_status_t
 __adf_os_init_work(adf_os_handle_t    hdl,
                    __adf_os_work_t      *work,
                    adf_os_defer_fn_t    func,
@@ -81,7 +81,7 @@ __adf_os_init_work(adf_os_handle_t    hdl,
     return A_STATUS_OK;
 }
 
-static inline a_status_t 
+static inline a_status_t
 __adf_os_init_delayed_work(adf_os_handle_t    hdl,
                    __adf_os_delayed_work_t      *work,
                    adf_os_defer_fn_t    func,
@@ -109,7 +109,7 @@ static inline void __adf_os_queue_work(adf_os_handle_t hdl, __adf_os_workqueue_t
     queue_work(wqueue, work);
 #else
     queue_work(wqueue, &work->work);
-#endif    
+#endif
 }
 
 static inline void __adf_os_queue_delayed_work(adf_os_handle_t hdl, __adf_os_workqueue_t *wqueue, __adf_os_delayed_work_t* work, a_uint32_t delay)
@@ -118,7 +118,7 @@ static inline void __adf_os_queue_delayed_work(adf_os_handle_t hdl, __adf_os_wor
     queue_delayed_work(wqueue, work, delay);
 #else
     queue_delayed_work(wqueue, &work->dwork, delay);
-#endif    
+#endif
 }
 
 static inline void __adf_os_flush_workqueue(adf_os_handle_t hdl, __adf_os_workqueue_t *wqueue)
@@ -137,11 +137,11 @@ static inline  a_status_t __adf_os_init_bh(adf_os_handle_t  hdl,
                                      void               *arg)
 {
      tasklet_init(bh, (__adf_os_bh_fn_t)func, (unsigned long)arg);
-  
+
      return A_STATUS_OK;
 }
 
-static inline a_status_t 
+static inline a_status_t
 __adf_os_sched_work(adf_os_handle_t hdl, __adf_os_work_t  * work)
 {
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,19)
@@ -152,15 +152,15 @@ __adf_os_sched_work(adf_os_handle_t hdl, __adf_os_work_t  * work)
     return A_STATUS_OK;
 }
 
-static inline a_status_t  __adf_os_sched_bh(adf_os_handle_t hdl, 
+static inline a_status_t  __adf_os_sched_bh(adf_os_handle_t hdl,
                                      struct tasklet_struct * bh)
 {
     tasklet_schedule(bh);
-     
+
     return A_STATUS_OK;
 }
 
-static inline a_status_t 
+static inline a_status_t
 __adf_os_disable_work(adf_os_handle_t hdl, __adf_os_work_t  * work)
 {
    /**
@@ -168,7 +168,7 @@ __adf_os_disable_work(adf_os_handle_t hdl, __adf_os_work_t  * work)
     */
     return A_STATUS_OK;
 }
-static inline a_status_t 
+static inline a_status_t
 __adf_os_disable_bh(adf_os_handle_t hdl, struct tasklet_struct *bh)
 {
     tasklet_kill(bh);
diff --git a/CORE/SERVICES/COMMON/adf/linux/adf_os_dma_pvt.h b/CORE/SERVICES/COMMON/adf/linux/adf_os_dma_pvt.h
index d814e452018f..ed6066c78800 100644
--- a/CORE/SERVICES/COMMON/adf/linux/adf_os_dma_pvt.h
+++ b/CORE/SERVICES/COMMON/adf/linux/adf_os_dma_pvt.h
@@ -43,20 +43,20 @@
 
 /**
  * XXX:error handling
- * 
+ *
  * @brief allocate a DMA buffer mapped to local bus Direction
  *        doesnt matter, since this API is called at init time.
  *
  * @param size
  * @param coherentSMP_CACHE_BYTES
  * @param dmap
- * 
+ *
  * @return void*
  */
 static inline void *
-__adf_os_dmamem_alloc(adf_os_device_t     osdev, 
-                      size_t       size, 
-                      a_bool_t            coherent, 
+__adf_os_dmamem_alloc(adf_os_device_t     osdev,
+                      size_t       size,
+                      a_bool_t            coherent,
                       __adf_os_dma_map_t   *dmap)
 {
     void               *vaddr;
@@ -70,7 +70,7 @@ __adf_os_dmamem_alloc(adf_os_device_t     osdev,
    lmap->coherent = coherent;
 
    if(coherent)
-       vaddr = dma_alloc_coherent(osdev->dev, size, &lmap->seg[0].daddr, 
+       vaddr = dma_alloc_coherent(osdev->dev, size, &lmap->seg[0].daddr,
                                   GFP_ATOMIC);
    else
        vaddr = dma_alloc_noncoherent(osdev->dev, size, &lmap->seg[0].daddr,
@@ -82,18 +82,18 @@ __adf_os_dmamem_alloc(adf_os_device_t     osdev,
    lmap->mapped = 1;
 
    (*dmap) = lmap;
-   
+
    return vaddr;
 }
 
-/* 
- * Free a previously mapped DMA buffer 
+/*
+ * Free a previously mapped DMA buffer
  * Direction doesnt matter, since this API is called at closing time.
  */
 static inline void
 __adf_os_dmamem_free(adf_os_device_t    osdev, __adf_os_size_t size,
                      a_bool_t coherent, void *vaddr, __adf_os_dma_map_t dmap)
-{ 
+{
     adf_os_assert(dmap->mapped);
 
     if(coherent)
@@ -107,8 +107,8 @@ __adf_os_dmamem_free(adf_os_device_t    osdev, __adf_os_size_t size,
 
 #define __adf_os_dmamem_map2addr(_dmap)    ((_dmap)->seg[0].daddr)
 
-static inline void 
-__adf_os_dmamem_cache_sync(__adf_os_device_t osdev, __adf_os_dma_map_t dmap, 
+static inline void
+__adf_os_dmamem_cache_sync(__adf_os_device_t osdev, __adf_os_dma_map_t dmap,
                            adf_os_cache_sync_t sync)
 {
     if(!dmap->coherent){
diff --git a/CORE/SERVICES/COMMON/adf/linux/adf_os_io_pvt.h b/CORE/SERVICES/COMMON/adf/linux/adf_os_io_pvt.h
index 532eea1be04e..04050fd5682f 100644
--- a/CORE/SERVICES/COMMON/adf/linux/adf_os_io_pvt.h
+++ b/CORE/SERVICES/COMMON/adf/linux/adf_os_io_pvt.h
@@ -47,7 +47,7 @@
 
 #define __adf_os_reg_read32(_dev, _addr)    \
   readl((volatile void __iomem *)((_dev)->res.vaddr + (_addr)))
-  
+
 #define __adf_os_reg_read64(_dev, _addr)    \
   readq((volatile void __iomem *)((_dev)->res.vaddr + (_addr)))
 
diff --git a/CORE/SERVICES/COMMON/adf/linux/adf_os_lock_pvt.h b/CORE/SERVICES/COMMON/adf/linux/adf_os_lock_pvt.h
index 1a0c864305a5..579f7c01495c 100644
--- a/CORE/SERVICES/COMMON/adf/linux/adf_os_lock_pvt.h
+++ b/CORE/SERVICES/COMMON/adf/linux/adf_os_lock_pvt.h
@@ -45,17 +45,17 @@ typedef struct __adf_os_linux_spinlock {
 } adf_os_linux_spinlock_t;
 
 /* define for flag */
-#define ADF_OS_LINUX_UNLOCK_BH 	1
+#define ADF_OS_LINUX_UNLOCK_BH	1
 
 typedef adf_os_linux_spinlock_t   __adf_os_spinlock_t;
 typedef struct semaphore __adf_os_mutex_t;
 
-/** 
+/**
  * @brief Initialize the mutex
- * 
+ *
  * @param mutex
- * 
- * @return 
+ *
+ * @return
  */
 static inline a_status_t
 __adf_os_init_mutex(struct semaphore *m)
@@ -85,7 +85,7 @@ __adf_os_mutex_release(adf_os_device_t osdev, struct semaphore *m)
     up(m);
 }
 
-static inline a_status_t 
+static inline a_status_t
 __adf_os_spinlock_init(__adf_os_spinlock_t *lock)
 {
     spin_lock_init(&lock->spinlock);
@@ -107,9 +107,9 @@ __adf_os_spin_lock(__adf_os_spinlock_t *lock)
     spin_lock(&lock->spinlock);
 }
 
-/** 
+/**
  * @brief Unlock the spinlock and enables the Preemption
- * 
+ *
  * @param lock
  * @param flags
  */
@@ -141,9 +141,9 @@ __adf_os_spin_unlock_irqrestore(__adf_os_spinlock_t *lock)
     spin_unlock_irqrestore(&lock->spinlock, lock->_flags);
 }
 
-/** 
+/**
  * @brief Acquire the spinlock and disable bottom halves
- * 
+ *
  * @param lock
  */
 
@@ -157,12 +157,12 @@ static inline void
 __adf_os_spin_lock_bh(__adf_os_spinlock_t *lock)
 {
 	if (likely(irqs_disabled() || in_softirq())) {
-		spin_lock(&lock->spinlock);	
+		spin_lock(&lock->spinlock);
 	} else {
 		spin_lock_bh(&lock->spinlock);
 		lock->flags |= ADF_OS_LINUX_UNLOCK_BH;
-	}	
-   
+	}
+
 }
 static inline void
 __adf_os_spin_unlock_bh(__adf_os_spinlock_t *lock)
@@ -171,13 +171,13 @@ __adf_os_spin_unlock_bh(__adf_os_spinlock_t *lock)
 		lock->flags &= ~ADF_OS_LINUX_UNLOCK_BH;
 		spin_unlock_bh(&lock->spinlock);
 	} else
-		spin_unlock(&lock->spinlock);	
+		spin_unlock(&lock->spinlock);
 }
 
 static inline a_bool_t
-__adf_os_spinlock_irq_exec(adf_os_handle_t  hdl, 
-                           __adf_os_spinlock_t      *lock, 
-                           adf_os_irqlocked_func_t func, 
+__adf_os_spinlock_irq_exec(adf_os_handle_t  hdl,
+                           __adf_os_spinlock_t      *lock,
+                           adf_os_irqlocked_func_t func,
                            void            *arg)
 {
     unsigned long flags;
diff --git a/CORE/SERVICES/COMMON/adf/linux/adf_os_mem_pvt.h b/CORE/SERVICES/COMMON/adf/linux/adf_os_mem_pvt.h
index b4f5212acafe..e6a1fb6226c5 100644
--- a/CORE/SERVICES/COMMON/adf/linux/adf_os_mem_pvt.h
+++ b/CORE/SERVICES/COMMON/adf/linux/adf_os_mem_pvt.h
@@ -163,7 +163,7 @@ __adf_os_mem_move(void *dst, const void *src, size_t size)
  */
 static inline a_int32_t
 __adf_os_str_cmp(const char *str1, const char *str2)
-{   
+{
     return strcmp(str1, str2);
 }
 
@@ -178,7 +178,7 @@ __adf_os_str_cmp(const char *str1, const char *str2)
  */
 static inline char *
 __adf_os_str_ncopy(char *dest, const char *src, a_uint32_t bytes)
-{   
+{
     return strncpy(dest, src, bytes);
 }
 
@@ -191,7 +191,7 @@ __adf_os_str_ncopy(char *dest, const char *src, a_uint32_t bytes)
  */
 static inline adf_os_size_t
 __adf_os_str_len(const char *str)
-{   
+{
     return strlen(str);
 }
 
diff --git a/CORE/SERVICES/COMMON/adf/linux/adf_os_postpack_pvt.h b/CORE/SERVICES/COMMON/adf/linux/adf_os_postpack_pvt.h
index a3be6354aca2..ce26e170295c 100644
--- a/CORE/SERVICES/COMMON/adf/linux/adf_os_postpack_pvt.h
+++ b/CORE/SERVICES/COMMON/adf/linux/adf_os_postpack_pvt.h
@@ -28,4 +28,4 @@
 
 /**
  * @brief Linux does not require a postpack # directive.
- */ 
+ */
diff --git a/CORE/SERVICES/COMMON/adf/linux/adf_os_prepack_pvt.h b/CORE/SERVICES/COMMON/adf/linux/adf_os_prepack_pvt.h
index af6fd8a08576..17e49f860add 100644
--- a/CORE/SERVICES/COMMON/adf/linux/adf_os_prepack_pvt.h
+++ b/CORE/SERVICES/COMMON/adf/linux/adf_os_prepack_pvt.h
@@ -28,4 +28,4 @@
 
 /**
  * @brief Linux does not require a prepack # directive.
- */ 
+ */
diff --git a/CORE/SERVICES/COMMON/adf/linux/adf_os_pseudo_pvt.h b/CORE/SERVICES/COMMON/adf/linux/adf_os_pseudo_pvt.h
index c956070eac4a..605aa1360d5c 100644
--- a/CORE/SERVICES/COMMON/adf/linux/adf_os_pseudo_pvt.h
+++ b/CORE/SERVICES/COMMON/adf/linux/adf_os_pseudo_pvt.h
@@ -76,4 +76,3 @@ extern int __adf_net_pseudo_attach(const char *mod_name); \
 extern int __adf_net_pseudo_detach(const char *mod_name);
 
 #endif
-
diff --git a/CORE/SERVICES/COMMON/adf/linux/adf_os_time_pvt.h b/CORE/SERVICES/COMMON/adf/linux/adf_os_time_pvt.h
index fe588260c0d3..d8e07af89614 100644
--- a/CORE/SERVICES/COMMON/adf/linux/adf_os_time_pvt.h
+++ b/CORE/SERVICES/COMMON/adf/linux/adf_os_time_pvt.h
@@ -105,8 +105,8 @@ __adf_os_mdelay(a_uint32_t msecs)
 
 /**
  * @brief Check if _a is later than _b.
- */ 
-static inline a_bool_t 
+ */
+static inline a_bool_t
 __adf_os_time_after(__adf_time_t a, __adf_time_t b)
 {
     return ((long)(b) - (long)(a) < 0);
@@ -114,7 +114,7 @@ __adf_os_time_after(__adf_time_t a, __adf_time_t b)
 
 /**
  * @brief Check if _a is prior to _b.
- */ 
+ */
 static inline a_bool_t
 __adf_os_time_before(__adf_time_t a, __adf_time_t b)
 {
@@ -123,7 +123,7 @@ __adf_os_time_before(__adf_time_t a, __adf_time_t b)
 
 /**
  * @brief Check if _a atleast as recent as _b, if not later.
- */ 
+ */
 static inline a_bool_t
 __adf_os_time_after_eq(__adf_time_t a, __adf_time_t b)
 {
diff --git a/CORE/SERVICES/COMMON/adf/linux/adf_os_timer_pvt.h b/CORE/SERVICES/COMMON/adf/linux/adf_os_timer_pvt.h
index 2a0b638bdcb9..3c5a188fb244 100644
--- a/CORE/SERVICES/COMMON/adf/linux/adf_os_timer_pvt.h
+++ b/CORE/SERVICES/COMMON/adf/linux/adf_os_timer_pvt.h
@@ -38,8 +38,8 @@
 #endif
 #include <adf_os_types.h>
 
-/* 
- * timer data type 
+/*
+ * timer data type
  */
 typedef struct timer_list       __adf_os_timer_t;
 
@@ -49,7 +49,7 @@ typedef struct timer_list       __adf_os_timer_t;
 
 typedef void (*adf_dummy_timer_func_t)(unsigned long arg);
 
-/* 
+/*
  * Initialize a timer
  */
 static inline a_status_t
@@ -65,8 +65,8 @@ __adf_os_timer_init(adf_os_handle_t      hdl,
     return A_STATUS_OK;
 }
 
-/* 
- * start a timer 
+/*
+ * start a timer
  */
 static inline a_status_t
 __adf_os_timer_start(struct timer_list *timer, a_uint32_t delay)
@@ -77,8 +77,8 @@ __adf_os_timer_start(struct timer_list *timer, a_uint32_t delay)
     return A_STATUS_OK;
 }
 
-/* 
- * modify a timer 
+/*
+ * modify a timer
  */
 static inline a_status_t
 __adf_os_timer_mod(struct timer_list *timer, a_uint32_t delay)
diff --git a/CORE/SERVICES/COMMON/adf/linux/adf_os_types_pvt.h b/CORE/SERVICES/COMMON/adf/linux/adf_os_types_pvt.h
index 7afa760c0c1a..5930ea034e25 100644
--- a/CORE/SERVICES/COMMON/adf/linux/adf_os_types_pvt.h
+++ b/CORE/SERVICES/COMMON/adf/linux/adf_os_types_pvt.h
@@ -142,7 +142,7 @@ struct __adf_device  {
     struct device          *dev;
     __adf_os_resource_t    res;
     __adf_os_intr          func;/*Interrupt handler*/
-}; 
+};
 
 typedef struct __adf_device *__adf_os_device_t;
 
@@ -152,7 +152,7 @@ typedef uint8_t __iomem * __adf_os_iomem_t;
 
 typedef struct __adf_os_segment{
     dma_addr_t  daddr;
-    uint32_t    len; 
+    uint32_t    len;
 }__adf_os_segment_t;
 
 struct __adf_os_dma_map{
@@ -166,7 +166,7 @@ typedef uint32_t  ath_dma_addr_t;
 typedef uint8_t           __a_uint8_t;
 typedef int8_t            __a_int8_t;
 typedef uint16_t          __a_uint16_t;
-typedef int16_t           __a_int16_t; 
+typedef int16_t           __a_int16_t;
 typedef uint32_t          __a_uint32_t;
 typedef int32_t           __a_int32_t;
 typedef uint64_t          __a_uint64_t;
@@ -181,7 +181,7 @@ enum __adf_net_wireless_evcode{
     __ADF_IEEE80211_SCAN = SIOCGIWSCAN,
     __ADF_IEEE80211_REPLAY = IWEVCUSTOM,
     __ADF_IEEE80211_MICHAEL = IWEVCUSTOM,
-    __ADF_IEEE80211_REJOIN = IWEVCUSTOM, 
+    __ADF_IEEE80211_REJOIN = IWEVCUSTOM,
     __ADF_CUSTOM_PUSH_BUTTON = IWEVCUSTOM,
 };
 
diff --git a/CORE/SERVICES/COMMON/adf/linux/adf_os_util_pvt.h b/CORE/SERVICES/COMMON/adf/linux/adf_os_util_pvt.h
index 4a5707982133..7877b4dbf567 100644
--- a/CORE/SERVICES/COMMON/adf/linux/adf_os_util_pvt.h
+++ b/CORE/SERVICES/COMMON/adf/linux/adf_os_util_pvt.h
@@ -45,7 +45,7 @@
 #define __adf_os_likely(_expr)     likely(_expr)
 
 /**
- * @brief memory barriers. 
+ * @brief memory barriers.
  */
 #define __adf_os_wmb()                wmb()
 #define __adf_os_rmb()                rmb()
@@ -83,10 +83,10 @@
 
 /**
  * @brief replace with the name of the function
- */ 
+ */
 #define __adf_os_function   __FUNCTION__
 
-static inline a_status_t 
+static inline a_status_t
 __adf_os_get_rand(adf_os_handle_t  hdl, uint8_t *ptr, uint32_t  len)
 {
     get_random_bytes(ptr, len);
@@ -96,8 +96,8 @@ __adf_os_get_rand(adf_os_handle_t  hdl, uint8_t *ptr, uint32_t  len)
 
 /**
  * @brief return square root
- */ 
-static __adf_os_inline a_uint32_t __adf_os_int_sqrt(a_uint32_t x)  
+ */
+static __adf_os_inline a_uint32_t __adf_os_int_sqrt(a_uint32_t x)
 {
 	return int_sqrt(x);
 }
diff --git a/CORE/SERVICES/COMMON/ah_osdep.h b/CORE/SERVICES/COMMON/ah_osdep.h
index 540767a7bd09..0e0a7e464107 100644
--- a/CORE/SERVICES/COMMON/ah_osdep.h
+++ b/CORE/SERVICES/COMMON/ah_osdep.h
@@ -119,7 +119,7 @@ typedef u_int32_t os_atomic_t;
 
 
 
-/* 
+/*
 
  * Supported Bus types
 
@@ -216,7 +216,7 @@ struct hal_reg_parm {
 
     u_int16_t            diversityControl;                // Enable/disable antenna diversity
 
-    u_int16_t            antennaSwitchSwap; 
+    u_int16_t            antennaSwitchSwap;
 
     u_int32_t            forceBias;
 
@@ -224,7 +224,7 @@ struct hal_reg_parm {
 
     int                  calInFlash;
 
-#ifdef ATH_SUPPORT_TxBF         
+#ifdef ATH_SUPPORT_TxBF
 
     u_int8_t             CVTimeOut;
 
@@ -464,4 +464,3 @@ extern void ath_hal_get_chip_revisionid(u_int32_t *);
 #endif
 
 #endif /* _ATH_AH_OSDEP_H_ */
-
diff --git a/CORE/SERVICES/COMMON/bmi.h b/CORE/SERVICES/COMMON/bmi.h
index e655985d4645..a70f695fe558 100644
--- a/CORE/SERVICES/COMMON/bmi.h
+++ b/CORE/SERVICES/COMMON/bmi.h
@@ -44,7 +44,7 @@ extern "C" {
 #include "osapi_linux.h"
 #include "bmi_msg.h"
 #include "ol_if_athvar.h"
-    
+
 A_STATUS bmi_download_firmware(struct ol_softc *scn);
 
 void
diff --git a/CORE/SERVICES/COMMON/bmi_msg.h b/CORE/SERVICES/COMMON/bmi_msg.h
index 4ea4ae49e33a..fb5a37030b93 100644
--- a/CORE/SERVICES/COMMON/bmi_msg.h
+++ b/CORE/SERVICES/COMMON/bmi_msg.h
@@ -104,7 +104,7 @@
          *    A_UINT8       data[length]
          * Response format: none
          */
-/* 
+/*
  * Capbility to write "segmented files" is provided for two reasons
  * 1) backwards compatibility for certain situations where Hosts
  *    have limited flexibility
@@ -138,7 +138,7 @@
  * can use an arbitrary address.  In each BMI_WRITE_MEMORY command, the
  * length specifies the number of data bytes transmitted (except for the
  * special cases listed above).
- * 
+ *
  * Alternatively, a segmented file may be sent to the Target using a
  * BMI_LZ_STREAM_START command with address=BMI_SEGMENTED_WRITE_ADDR
  * followed by a series of BMI_LZ_DATA commands that each send the next portion
@@ -208,7 +208,7 @@ struct bmi_segmented_metadata {
          * Request format:
          *    A_UINT32      command (BMI_READ_REGISTER)
          *    A_UINT32      address
-         * Response format: 
+         * Response format:
          *    A_UINT32      value
          */
 
diff --git a/CORE/SERVICES/COMMON/dbglog_id.h b/CORE/SERVICES/COMMON/dbglog_id.h
index ee44007965db..d426b1a1cd99 100644
--- a/CORE/SERVICES/COMMON/dbglog_id.h
+++ b/CORE/SERVICES/COMMON/dbglog_id.h
@@ -52,7 +52,7 @@ extern "C" {
 
 /*
 * The target state machine framework will send dbglog messages on behalf on
-* other modules. We do this do avoid each module adding identical dbglog code 
+* other modules. We do this do avoid each module adding identical dbglog code
 * for state transitions and event processing. We also don't want to force each
 * module to define the the same XXX_DBGID_SM_MSG with the same value below.
 * Instead we use a special ID that the host dbglog code recognizes as a
@@ -644,8 +644,8 @@ extern "C" {
 #define WAL_DBGID_TX_BA_SETUP                       36
 #define WAL_DBGID_RX_BA_SETUP                       37
 #define WAL_DBGID_DEV_TX_TIMEOUT                    38
-#define WAL_DBGID_DEV_RX_TIMEOUT                    39 
-#define WAL_DBGID_STA_VDEV_XRETRY                   40  
+#define WAL_DBGID_DEV_RX_TIMEOUT                    39
+#define WAL_DBGID_STA_VDEV_XRETRY                   40
 #define WAL_DBGID_DCS                               41
 #define WAL_DBGID_MGMT_TX_FAIL                      42
 #define WAL_DBGID_SET_M4_SENT_MANUALLY              43
@@ -803,7 +803,7 @@ extern "C" {
 #define WOW_RECV_MGMT 4
 #define WOW_WAKE_HOST_MGMT 5
 #define WOW_RECV_EVENT 6
-#define WOW_WAKE_HOST_EVENT 7 
+#define WOW_WAKE_HOST_EVENT 7
 #define WOW_INIT 8
 #define WOW_RECV_MAGIC_PKT 9
 #define WOW_RECV_BITMAP_PATTERN 10
@@ -996,4 +996,3 @@ extern "C" {
 #endif
 
 #endif /* _DBGLOG_ID_H_ */
-
diff --git a/CORE/SERVICES/COMMON/dl_list.h b/CORE/SERVICES/COMMON/dl_list.h
index d6a51eb65759..241c81a91e4a 100644
--- a/CORE/SERVICES/COMMON/dl_list.h
+++ b/CORE/SERVICES/COMMON/dl_list.h
@@ -49,14 +49,14 @@ typedef struct _DL_LIST {
 #define DL_LIST_INIT(pList)\
     {(pList)->pPrev = pList; (pList)->pNext = pList;}
 
-/* faster macro to init list and add a single item */    
+/* faster macro to init list and add a single item */
 #define DL_LIST_INIT_AND_ADD(pList,pItem) \
 {   (pList)->pPrev = (pItem); \
     (pList)->pNext = (pItem); \
     (pItem)->pNext = (pList); \
     (pItem)->pPrev = (pList); \
 }
-    
+
 #define DL_LIST_IS_EMPTY(pList) (((pList)->pPrev == (pList)) && ((pList)->pNext == (pList)))
 #define DL_LIST_GET_ITEM_AT_HEAD(pList) (pList)->pNext
 #define DL_LIST_GET_ITEM_AT_TAIL(pList) (pList)->pPrev
@@ -172,9 +172,9 @@ static __inline void DL_ListTransferItemsToTail(PDL_LIST pDest, PDL_LIST pSrc) {
             /* cut out circular list in src and re-attach to end of dest */
         pSrc->pPrev->pNext = pDest;
         pSrc->pNext->pPrev = pDest->pPrev;
-        pDest->pPrev->pNext = pSrc->pNext; 
+        pDest->pPrev->pNext = pSrc->pNext;
         pDest->pPrev = pSrc->pPrev;
-            /* terminate src list, it is now empty */      
+            /* terminate src list, it is now empty */
         pSrc->pPrev = pSrc;
         pSrc->pNext = pSrc;
     }
@@ -189,7 +189,7 @@ static __inline void DL_ListTransferItemsToHead(PDL_LIST pDest, PDL_LIST pSrc) {
         pDest->pNext->pPrev = pSrc->pPrev;
         pSrc->pPrev->pNext = pDest->pNext;
         pDest->pNext = pSrc->pNext;
-            /* terminate src list, it is now empty */      
+            /* terminate src list, it is now empty */
         pSrc->pPrev = pSrc;
         pSrc->pNext = pSrc;
     }
diff --git a/CORE/SERVICES/COMMON/enet.h b/CORE/SERVICES/COMMON/enet.h
index bb2c54f9870d..9e9c64618cf7 100644
--- a/CORE/SERVICES/COMMON/enet.h
+++ b/CORE/SERVICES/COMMON/enet.h
@@ -63,7 +63,7 @@ struct llc_snap_hdr_t {
 #define LLC_SNAP_HDR_LEN (sizeof(struct llc_snap_hdr_t))
 #define LLC_SNAP_HDR_OFFSET_ETHERTYPE \
     (offsetof(struct llc_snap_hdr_t, ethertype[0]))
-	
+
 #define ETHERTYPE_VLAN_LEN  4
 
 struct ethernet_vlan_hdr_t {
diff --git a/CORE/SERVICES/COMMON/hif.h b/CORE/SERVICES/COMMON/hif.h
index b7e0c722729c..ae77ec8c5b7d 100644
--- a/CORE/SERVICES/COMMON/hif.h
+++ b/CORE/SERVICES/COMMON/hif.h
@@ -110,7 +110,7 @@ extern void __hdd_wlan_exit(void);
 #define HIF_DMODE_MASK              (HIF_BYTE_BASIS | HIF_BLOCK_BASIS)
 
 /*
- *     amode - This indicates if the address has to be incremented on AR6000 
+ *     amode - This indicates if the address has to be incremented on AR6000
  *             after every read/write operation (HIF?FIXED_ADDRESS/
  *             HIF_INCREMENTAL_ADDRESS).
  */
@@ -561,7 +561,7 @@ inline int HIFDiagWriteMem(HIF_DEVICE *hif_device, A_UINT32 address, A_UINT8 *da
  *   The LIKELY interface works just like A_TARGET_ACCESS_BEGIN,
  *   except that it may return before the Target is actually
  *   available. It's a vague indication that some Target accesses
- *   are expected "soon".  When the LIKELY API is used, 
+ *   are expected "soon".  When the LIKELY API is used,
  *   A_TARGET_ACCESS_BEGIN must be used before any access.
  *
  *   There are several uses for the LIKELY/UNLIKELY API:
@@ -713,7 +713,7 @@ extern void HIFTargetWriteChecked(A_target_id_t targid, A_UINT32 offset, A_UINT3
 #endif
 
 #endif /* CONFIG_ATH_PCIE_MAX_PERF */
-    
+
 /*Macro to increment the HIF layer packet error count*/
 #define OL_ATH_HIF_PKT_ERROR_COUNT_INCR(_hif_state,_hif_ecode);\
 {\
diff --git a/CORE/SERVICES/COMMON/htc.h b/CORE/SERVICES/COMMON/htc.h
index bfaf1cac832c..31e92e79e648 100644
--- a/CORE/SERVICES/COMMON/htc.h
+++ b/CORE/SERVICES/COMMON/htc.h
@@ -155,7 +155,7 @@ typedef PREPACK struct {
              reserved : 16;
 } POSTPACK HTC_UNKNOWN_MSG;
 
-#define HTC_UNKNOWN_MSG_MESSAGEID_LSB                 0 
+#define HTC_UNKNOWN_MSG_MESSAGEID_LSB                 0
 #define HTC_UNKNOWN_MSG_MESSAGEID_MASK                0x0000ffff
 #define HTC_UNKNOWN_MSG_MESSAGEID_OFFSET              0x00000000
 
@@ -193,7 +193,7 @@ typedef PREPACK struct {
 
 #define HTC_READY_EX_MSG_HTCVERSION_LSB               0
 #define HTC_READY_EX_MSG_HTCVERSION_MASK              0x000000ff
-#define HTC_READY_EX_MSG_HTCVERSION_OFFSET            sizeof(HTC_READY_MSG) 
+#define HTC_READY_EX_MSG_HTCVERSION_OFFSET            sizeof(HTC_READY_MSG)
 #define HTC_READY_EX_MSG_MAXMSGSPERHTCBUNDLE_LSB      8
 #define HTC_READY_EX_MSG_MAXMSGSPERHTCBUNDLE_MASK     0x0000ff00
 #define HTC_READY_EX_MSG_MAXMSGSPERHTCBUNDLE_OFFSET   sizeof(HTC_READY_MSG)
@@ -323,7 +323,7 @@ typedef PREPACK struct {
 #define HTC_SETUP_COMPLETE_FLAGS_ENABLE_BUNDLE_RECV     (1 << 0)    /* enable recv bundling from target */
 #define HTC_SETUP_COMPLETE_FLAGS_DISABLE_TX_CREDIT_FLOW (1 << 1)    /* disable credit based flow control,
                                                                        only supported on some interconnects */
-                                                                       
+
 /* connect response status codes */
 #define HTC_SERVICE_SUCCESS      0  /* success */
 #define HTC_SERVICE_NOT_FOUND    1  /* service could not be found */
@@ -397,7 +397,7 @@ typedef PREPACK struct {
 #define HTC_LOOKAHEAD_REPORT_LOOKAHEAD3_OFFSET    0x00000004
 #define HTC_LOOKAHEAD_REPORT_POSTVALID_LSB        0
 #define HTC_LOOKAHEAD_REPORT_POSTVALID_MASK       0x000000ff
-#define HTC_LOOKAHEAD_REPORT_POSTVALID_OFFSET     0x00000008 
+#define HTC_LOOKAHEAD_REPORT_POSTVALID_OFFSET     0x00000008
 
 typedef PREPACK struct {
     A_UINT32 LookAhead0 : 8,    /* 4 byte lookahead */
@@ -425,4 +425,3 @@ typedef PREPACK struct {
 
 
 #endif /* __HTC_H__ */
-
diff --git a/CORE/SERVICES/COMMON/htc_api.h b/CORE/SERVICES/COMMON/htc_api.h
index c7e22096b5f6..1711049e3567 100644
--- a/CORE/SERVICES/COMMON/htc_api.h
+++ b/CORE/SERVICES/COMMON/htc_api.h
@@ -58,7 +58,7 @@ typedef struct _HTC_INIT_INFO {
     void   (*TargetFailure)(void *Instance, A_STATUS Status);
     void   (*TargetSendSuspendComplete)(void *ctx);
 } HTC_INIT_INFO;
-    
+
 /* Struct for HTC layer packet stats*/
 struct ol_ath_htc_stats {
     int     htc_get_pkt_q_fail_count;
@@ -288,8 +288,8 @@ typedef struct _HTC_ENDPOINT_STATS {
   @example:
   @see also: HTCDestroy
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-HTC_HANDLE HTCCreate(void *HifDevice, 
-                     HTC_INIT_INFO *pInfo, 
+HTC_HANDLE HTCCreate(void *HifDevice,
+                     HTC_INIT_INFO *pInfo,
                      adf_os_device_t osdev);
 /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
   @desc: Get the underlying HIF device handle
@@ -431,7 +431,7 @@ A_STATUS    HTCSendPkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket);
   @see also: HTCSendPkt
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
 #ifdef ATH_11AC_TXCOMPACT
-A_STATUS     HTCSendDataPkt(HTC_HANDLE HTCHandle, adf_nbuf_t       netbuf, 
+A_STATUS     HTCSendDataPkt(HTC_HANDLE HTCHandle, adf_nbuf_t       netbuf,
                             int Epid, int ActualLength);
 #else  /*ATH_11AC_TXCOMPACT*/
 A_STATUS    HTCSendDataPkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket);
@@ -654,7 +654,7 @@ A_STATUS HTCWaitForPendingRecv(HTC_HANDLE   HTCHandle,
 
 /* function to fetch stats from htc layer*/
 struct ol_ath_htc_stats *ieee80211_ioctl_get_htc_stats(HTC_HANDLE HTCHandle);
-    
+
 #ifdef  HIF_USB
 #define HTCReturnReceivePkt(target,p,osbuf)                   \
     A_NETBUF_FREE(osbuf);                                     \
diff --git a/CORE/SERVICES/COMMON/htc_services.h b/CORE/SERVICES/COMMON/htc_services.h
index 85c65c96467d..130490b2e558 100644
--- a/CORE/SERVICES/COMMON/htc_services.h
+++ b/CORE/SERVICES/COMMON/htc_services.h
@@ -41,7 +41,7 @@
 
 typedef enum {
     RSVD_SERVICE_GROUP  = 0,
-    WMI_SERVICE_GROUP   = 1, 
+    WMI_SERVICE_GROUP   = 1,
     NMI_SERVICE_GROUP   = 2,
     HTT_SERVICE_GROUP   = 3,
     CFG_NV_SERVICE_GROUP = 4,
diff --git a/CORE/SERVICES/COMMON/hwdef.h b/CORE/SERVICES/COMMON/hwdef.h
index 3d2be54a046e..3da028932a1f 100644
--- a/CORE/SERVICES/COMMON/hwdef.h
+++ b/CORE/SERVICES/COMMON/hwdef.h
@@ -39,8 +39,8 @@ typedef enum {
     ANTENNA_DUMMY_MAX
 } ANTENNA_CONTROL;
 
-/* 
- * Number of (OEM-defined) functions using GPIO pins currently defined 
+/*
+ * Number of (OEM-defined) functions using GPIO pins currently defined
  *
  * Function 0: Link/Power LED
  * Function 1: Network/Activity LED
@@ -72,6 +72,6 @@ static INLINE int32_t cmpxchg(int32_t *_patomic_arg, int32_t _comparand, int32_t
 }
 
 
-#endif 
+#endif
 
 #endif
diff --git a/CORE/SERVICES/COMMON/ieee80211_common.h b/CORE/SERVICES/COMMON/ieee80211_common.h
index dbf7f008d6d6..4c7a6adb0955 100644
--- a/CORE/SERVICES/COMMON/ieee80211_common.h
+++ b/CORE/SERVICES/COMMON/ieee80211_common.h
@@ -66,7 +66,7 @@ struct ieee80211_plcp_hdr {
     u_int16_t   i_crc;
 } __packed;
 
-#define IEEE80211_PLCP_SFD      0xF3A0 
+#define IEEE80211_PLCP_SFD      0xF3A0
 #define IEEE80211_PLCP_SERVICE  0x00
 
 /*
@@ -295,7 +295,7 @@ struct ieee80211_ctlframe_addr2 {
 #define IEEE80211_FC0_SUBTYPE_NO_DATA_MASK  0x40
 #define IEEE80211_CONTAIN_DATA(_subtype) \
     (! ((_subtype) & IEEE80211_FC0_SUBTYPE_NO_DATA_MASK))
-    
+
 #define IEEE8023_MAX_LEN 0x600 /* 1536 - larger is Ethernet II */
 #define RFC1042_SNAP_ORGCODE_0 0x00
 #define RFC1042_SNAP_ORGCODE_1 0x00
@@ -319,7 +319,7 @@ struct ieee80211_ctlframe_addr2 {
 #define IEEE80211_HTSIG_LEN 6
 #define IEEE80211_SB_LEN    2
 
-/* 
+/*
  * Information element header format
  */
 struct ieee80211_ie_header {
@@ -327,7 +327,7 @@ struct ieee80211_ie_header {
     u_int8_t    length;         /* IE Length */
 } __packed;
 
-/* 
+/*
  * Country information element.
  */
 #define IEEE80211_COUNTRY_MAX_TRIPLETS (83)
@@ -494,8 +494,8 @@ struct ieee80211_wme_param {
                                                  WME_CAPINFO_UAPSD_BE)
 #define WME_CAPINFO_UAPSD_NONE                  0
 
-#define WME_UAPSD_AC_MAX_VAL 		1
-#define WME_UAPSD_AC_INVAL		 	WME_UAPSD_AC_MAX_VAL+1
+#define WME_UAPSD_AC_MAX_VAL		1
+#define WME_UAPSD_AC_INVAL			WME_UAPSD_AC_MAX_VAL+1
 
 /*
  * Atheros Advanced Capability information element.
@@ -570,18 +570,18 @@ struct ieee80211_ie_sfa {
 #define IEEE80211_ATHEC_OWLWDSWAR        0x0001
 #define IEEE80211_ATHEC_WEPTKIPAGGR	     0x0002
 #define IEEE80211_ATHEC_EXTRADELIMWAR    0x0004
-/* 
- * Management Frames 
+/*
+ * Management Frames
  */
 
 /*
  * *** Platform-specific code?? ***
- * In Vista one must use bit fields of type (unsigned short = u_int16_t) to 
+ * In Vista one must use bit fields of type (unsigned short = u_int16_t) to
  * ensure data structure is of the correct size. ANSI C used to specify only
  * "int" bit fields, which led to a larger structure size in Windows (32 bits).
- * 
+ *
  * We must make sure the following construction is valid in all OS's.
- */ 
+ */
 union ieee80211_capability {
     struct {
         u_int16_t    ess                 : 1;
@@ -609,7 +609,7 @@ struct ieee80211_beacon_frame {
     u_int8_t                      timestamp[8];    /* the value of sender's TSFTIMER */
     u_int16_t                     beacon_interval; /* the number of time units between target beacon transmission times */
     union ieee80211_capability    capability;
-/* Value of capability for every bit    
+/* Value of capability for every bit
 #define IEEE80211_CAPINFO_ESS               0x0001
 #define IEEE80211_CAPINFO_IBSS              0x0002
 #define IEEE80211_CAPINFO_CF_POLLABLE       0x0004
@@ -629,8 +629,8 @@ bits 14-15 are reserved
     struct ieee80211_ie_header    info_elements;
 } __packed;
 
-/* 
- * Management Action Frames 
+/*
+ * Management Action Frames
  */
 
 /* generic frame format */
@@ -680,7 +680,7 @@ struct ieee80211_action_measrep_header {
 /* HT - recommended transmission channel width */
 struct ieee80211_action_ht_txchwidth {
     struct ieee80211_action     at_header;
-    u_int8_t                    at_chwidth; 
+    u_int8_t                    at_chwidth;
 } __packed;
 
 #define IEEE80211_A_HT_TXCHWIDTH_20         0
@@ -814,7 +814,7 @@ struct ieee80211_delba_parameterset {
 struct ieee80211_action_ba_addbarequest {
     struct ieee80211_action             rq_header;
     u_int8_t                            rq_dialogtoken;
-    struct ieee80211_ba_parameterset    rq_baparamset; 
+    struct ieee80211_ba_parameterset    rq_baparamset;
     u_int16_t                           rq_batimeout;   /* in TUs */
     struct ieee80211_ba_seqctrl         rq_basequencectrl;
 } __packed;
@@ -824,7 +824,7 @@ struct ieee80211_action_ba_addbaresponse {
     struct ieee80211_action             rs_header;
     u_int8_t                            rs_dialogtoken;
     u_int16_t                           rs_statuscode;
-    struct ieee80211_ba_parameterset    rs_baparamset; 
+    struct ieee80211_ba_parameterset    rs_baparamset;
     u_int16_t                           rs_batimeout;   /* in TUs */
 } __packed;
 
@@ -1093,7 +1093,7 @@ struct vendor_ie_htcap {
 
 /* HT capability flags */
 #define IEEE80211_HTCAP_C_ADVCODING             0x0001
-#define IEEE80211_HTCAP_C_CHWIDTH40             0x0002  
+#define IEEE80211_HTCAP_C_CHWIDTH40             0x0002
 #define IEEE80211_HTCAP_C_SMPOWERSAVE_STATIC    0x0000 /* Capable of SM Power Save (Static) */
 #define IEEE80211_HTCAP_C_SMPOWERSAVE_DYNAMIC   0x0004 /* Capable of SM Power Save (Dynamic) */
 #define IEEE80211_HTCAP_C_SM_RESERVED           0x0008 /* Reserved */
@@ -1107,10 +1107,10 @@ struct vendor_ie_htcap {
 #define IEEE80211_HTCAP_C_RXSTBC_S                   8
 #define IEEE80211_HTCAP_C_DELAYEDBLKACK         0x0400
 #define IEEE80211_HTCAP_C_MAXAMSDUSIZE          0x0800  /* 1 = 8K, 0 = 3839B */
-#define IEEE80211_HTCAP_C_DSSSCCK40             0x1000  
-#define IEEE80211_HTCAP_C_PSMP                  0x2000  
-#define IEEE80211_HTCAP_C_INTOLERANT40          0x4000  
-#define IEEE80211_HTCAP_C_LSIGTXOPPROT          0x8000  
+#define IEEE80211_HTCAP_C_DSSSCCK40             0x1000
+#define IEEE80211_HTCAP_C_PSMP                  0x2000
+#define IEEE80211_HTCAP_C_INTOLERANT40          0x4000
+#define IEEE80211_HTCAP_C_LSIGTXOPPROT          0x8000
 
 #define IEEE80211_HTCAP_C_SM_MASK               0x000c /* Spatial Multiplexing (SM) capabitlity bitmask */
 
@@ -1137,10 +1137,10 @@ enum {
 
 /* HT extended capability flags */
 #define IEEE80211_HTCAP_EXTC_PCO                0x0001
-#define IEEE80211_HTCAP_EXTC_TRANS_TIME_RSVD    0x0000  
+#define IEEE80211_HTCAP_EXTC_TRANS_TIME_RSVD    0x0000
 #define IEEE80211_HTCAP_EXTC_TRANS_TIME_400     0x0002 /* 20-40 switch time */
 #define IEEE80211_HTCAP_EXTC_TRANS_TIME_1500    0x0004 /* in us             */
-#define IEEE80211_HTCAP_EXTC_TRANS_TIME_5000    0x0006 
+#define IEEE80211_HTCAP_EXTC_TRANS_TIME_5000    0x0006
 #define IEEE80211_HTCAP_EXTC_RSVD_1             0x00f8
 #define IEEE80211_HTCAP_EXTC_MCS_FEEDBACK_NONE  0x0000
 #define IEEE80211_HTCAP_EXTC_MCS_FEEDBACK_RSVD  0x0100
@@ -1161,15 +1161,15 @@ struct ieee80211_ie_htinfo_cmn {
                 hi_extchoff           : 2;    /* B0-1 extension channel offset */
 
 
-/* 
+/*
 
  * The following 2 consecutive bytes are defined in word in 80211n spec.
 
  * Some processors store MSB byte into lower memory address which causes wrong
 
- * wrong byte sequence in beacon. Thus we break into byte definition which should 
+ * wrong byte sequence in beacon. Thus we break into byte definition which should
 
- * avoid the problem for all processors 
+ * avoid the problem for all processors
 
  */
 
@@ -1242,23 +1242,23 @@ struct vendor_ie_htinfo {
 
 /* extension channel offset (2 bit signed number) */
 enum {
-    IEEE80211_HTINFO_EXTOFFSET_NA    = 0,   /* 0  no extension channel is present */            
-    IEEE80211_HTINFO_EXTOFFSET_ABOVE = 1,   /* +1 extension channel above control channel */ 
-    IEEE80211_HTINFO_EXTOFFSET_UNDEF = 2,   /* -2 undefined */ 
+    IEEE80211_HTINFO_EXTOFFSET_NA    = 0,   /* 0  no extension channel is present */
+    IEEE80211_HTINFO_EXTOFFSET_ABOVE = 1,   /* +1 extension channel above control channel */
+    IEEE80211_HTINFO_EXTOFFSET_UNDEF = 2,   /* -2 undefined */
     IEEE80211_HTINFO_EXTOFFSET_BELOW = 3    /* -1 extension channel below control channel*/
 };
 
 /* recommended transmission width set */
 enum {
-    IEEE80211_HTINFO_TXWIDTH_20,        
-    IEEE80211_HTINFO_TXWIDTH_2040       
+    IEEE80211_HTINFO_TXWIDTH_20,
+    IEEE80211_HTINFO_TXWIDTH_2040
 };
 
 /* operating flags */
 #define IEEE80211_HTINFO_OPMODE_PURE                0x00 /* no protection */
-#define IEEE80211_HTINFO_OPMODE_MIXED_PROT_OPT      0x01 /* prot optional (legacy device maybe present) */          
-#define IEEE80211_HTINFO_OPMODE_MIXED_PROT_40       0x02 /* prot required (20 MHz) */   
-#define IEEE80211_HTINFO_OPMODE_MIXED_PROT_ALL      0x03 /* prot required (legacy devices present) */       
+#define IEEE80211_HTINFO_OPMODE_MIXED_PROT_OPT      0x01 /* prot optional (legacy device maybe present) */
+#define IEEE80211_HTINFO_OPMODE_MIXED_PROT_40       0x02 /* prot required (20 MHz) */
+#define IEEE80211_HTINFO_OPMODE_MIXED_PROT_ALL      0x03 /* prot required (legacy devices present) */
 #define IEEE80211_HTINFO_OPMODE_NON_GF_PRESENT      0x04 /* non-greenfield devices present */
 
 #define IEEE80211_HTINFO_OPMODE_MASK                0x03 /* For protection 0x00-0x03 */
@@ -1352,7 +1352,7 @@ enum {
     IEEE80211_ELEMID_FMS_DESCRIPTOR   = 86,   /* 802.11v FMS descriptor IE */
     IEEE80211_ELEMID_FMS_REQUEST      = 87,   /* 802.11v FMS request IE */
     IEEE80211_ELEMID_FMS_RESPONSE     = 88,   /* 802.11v FMS response IE */
-    IEEE80211_ELEMID_BSSMAX_IDLE_PERIOD = 90, /* BSS MAX IDLE PERIOD */ 
+    IEEE80211_ELEMID_BSSMAX_IDLE_PERIOD = 90, /* BSS MAX IDLE PERIOD */
     IEEE80211_ELEMID_TFS_REQUEST      = 91,
     IEEE80211_ELEMID_TFS_RESPONSE     = 92,
     IEEE80211_ELEMID_TIM_BCAST_REQUEST  = 94,
@@ -1498,7 +1498,7 @@ struct ieee80211_ie_ssid {
     u_int8_t    ssid[32];
 } __packed;
 
-/* 
+/*
  * Supported rates
  */
 #define IEEE80211_MAX_SUPPORTED_RATES      8
@@ -1509,7 +1509,7 @@ struct ieee80211_ie_rates {
     u_int8_t    rate[IEEE80211_MAX_SUPPORTED_RATES];     /* IE Length */
 } __packed;
 
-/* 
+/*
  * Extended rates
  */
 #define IEEE80211_MAX_EXTENDED_RATES     256
@@ -1877,7 +1877,7 @@ enum {
 #define IEEE80211_MTU_MAX       2290
 #define IEEE80211_MTU_MIN       32
 
-/* Rather than using this default value, customer platforms can provide a custom value for this constant. 
+/* Rather than using this default value, customer platforms can provide a custom value for this constant.
   Coustomer platform will use the different define value by themself */
 #ifndef IEEE80211_MAX_MPDU_LEN
 #define IEEE80211_MAX_MPDU_LEN      (3840 + IEEE80211_CRC_LEN + \
@@ -1917,7 +1917,7 @@ A length of 3839 bytes is chosen here to support unaggregated data frames, any s
 
 #define IEEE80211_AID(b)    ((b) &~ 0xc000)
 
-/* 
+/*
  * RTS frame length parameters.  The default is specified in
  * the 802.11 spec.  The max may be wrong for jumbo frames.
  */
@@ -1931,7 +1931,7 @@ A length of 3839 bytes is chosen here to support unaggregated data frames, any s
 #define IEEE80211_FRAGMT_THRESHOLD_MIN        540      /* min frag threshold */
 #define IEEE80211_FRAGMT_THRESHOLD_MAX       2346      /* max frag threshold */
 
-/* 
+/*
  * Regulatory extention identifier for country IE.
  */
 #define IEEE80211_REG_EXT_ID        201
@@ -1991,14 +1991,14 @@ struct ieee80211_ie_ext_cap {
 #define IEEE80211_EXTCAPIE_TDLS_WIDE_BAND   0x20000080 /* bit-61 TDLS Wide Bandwidth support */
 #define IEEE80211_EXTCAPIE_OP_MODE_NOTIFY   0x40000000 /* bit-62 Operating Mode notification */
 
-/* 
+/*
  * These caps are populated when we recieve beacon/probe response
  * This is used to maintain local TDLS cap bit masks
  */
 
 #define IEEE80211_TDLS_PROHIBIT     0x00000001 /* bit-1 TDLS Prohibit Support */
 
-/* 
+/*
  * 20/40 BSS coexistence ie
  */
 struct ieee80211_ie_bss_coex {
@@ -2034,9 +2034,9 @@ struct ieee80211_ie_intolerant_report {
         u_int8_t reg_class;
         u_int8_t chan_list[1];          /* variable-length channel list */
 } __packed;
- 
+
 /*
- * 20/40 coext management action frame 
+ * 20/40 coext management action frame
  */
 struct ieee80211_action_bss_coex_frame {
         struct ieee80211_action                ac_header;
@@ -2143,7 +2143,7 @@ struct ieee80211_ie_vhtop {
         u_int8_t    vht_op_chwidth;              /* BSS Operational Channel width */
         u_int8_t    vht_op_ch_freq_seg1;         /* Channel Center frequency */
         u_int8_t    vht_op_ch_freq_seg2;         /* Channel Center frequency applicable
-                                                  * for 80+80MHz mode of operation */ 
+                                                  * for 80+80MHz mode of operation */
         u_int16_t   vhtop_basic_mcs_set;         /* Basic MCS set */
 } __packed;
 
@@ -2166,7 +2166,7 @@ struct ieee80211_ie_sec_chan_offset {
 #define IEEE80211_VHT_TXPWR_IS_SUB_ELEMENT          1  /* It checks whether its  sub element */
 #define IEEE80211_VHT_TXPWR_MAX_POWER_COUNT         4 /* Max TX power elements valid */
 #define IEEE80211_VHT_TXPWR_NUM_POWER_SUPPORTED     3 /* Max TX power elements supported */
-#define IEEE80211_VHT_TXPWR_LCL_MAX_PWR_UNITS_SHFT  3 /* B3-B5 Local Max transmit power units */ 
+#define IEEE80211_VHT_TXPWR_LCL_MAX_PWR_UNITS_SHFT  3 /* B3-B5 Local Max transmit power units */
 
 struct ieee80211_ie_vht_txpwr_env {
         u_int8_t    elem_id;
@@ -2190,7 +2190,7 @@ struct ieee80211_ie_wide_bw_switch {
         u_int8_t    elem_len;
         u_int8_t    new_ch_width;       /* New channel width */
         u_int8_t    new_ch_freq_seg1;   /* Channel Center frequency 1 */
-        u_int8_t    new_ch_freq_seg2;   /* Channel Center frequency 2 */ 
+        u_int8_t    new_ch_freq_seg2;   /* Channel Center frequency 2 */
 } __packed;
 
 #define IEEE80211_RSSI_RX       0x00000001
@@ -2213,4 +2213,3 @@ struct ieee80211_ie_wide_bw_switch {
 #define IEEE80211_P2P_WILDCARD_SSID_LEN     (sizeof(IEEE80211_P2P_WILDCARD_SSID) - 1)
 
 #endif /* _COMMON_IEEE80211_H_ */
-
diff --git a/CORE/SERVICES/COMMON/ieee80211_defines.h b/CORE/SERVICES/COMMON/ieee80211_defines.h
index 5c6111770963..039718acb24f 100644
--- a/CORE/SERVICES/COMMON/ieee80211_defines.h
+++ b/CORE/SERVICES/COMMON/ieee80211_defines.h
@@ -43,19 +43,19 @@
  * @brief Opaque handle of 802.11 protocal layer.
  */
 struct ieee80211com;
-typedef struct ieee80211com *wlan_dev_t; 
+typedef struct ieee80211com *wlan_dev_t;
 
 /**
  * @brief Opaque handle to App IE module.
 */
 struct wlan_mlme_app_ie;
-typedef struct wlan_mlme_app_ie *wlan_mlme_app_ie_t; 
+typedef struct wlan_mlme_app_ie *wlan_mlme_app_ie_t;
 
 /**
  * @brief Opaque handle of network instance (vap) in 802.11 protocal layer.
 */
 struct ieee80211vap;
-typedef struct ieee80211vap *wlan_if_t; 
+typedef struct ieee80211vap *wlan_if_t;
 
 struct ieee80211vapprofile;
 typedef struct ieee80211vapprofile *wlan_if_info_t;
@@ -70,13 +70,13 @@ typedef struct ieee80211_node *wlan_node_t;
  * @brief Opaque handle of OS interface (ifp in the case of unix ).
  */
 struct _os_if_t;
-typedef struct _os_if_t *os_if_t; 
+typedef struct _os_if_t *os_if_t;
 
 /**
  *
  * @brief Opaque handle.
  */
-typedef void *os_handle_t; 
+typedef void *os_handle_t;
 
 /**
  * @brief Opaque handle of a channel.
@@ -87,7 +87,7 @@ typedef struct ieee80211_channel *wlan_chan_t;
 /**
  * @brief Opaque handle scan_entry.
  */
-struct ieee80211_scan_entry; 
+struct ieee80211_scan_entry;
 typedef struct ieee80211_scan_entry *wlan_scan_entry_t;
 
 /* AoW related defines */
@@ -147,22 +147,22 @@ typedef struct ieee80211_rx_status {
 
 #define IEEE80211_MAX_ANTENNA       3                /* Keep the same as ATH_MAX_ANTENNA */
     u_int8_t    rs_rssictl[IEEE80211_MAX_ANTENNA];   /* RSSI (noise floor ajusted) */
-    u_int8_t    rs_rssiextn[IEEE80211_MAX_ANTENNA];  /* RSSI (noise floor ajusted) */    
+    u_int8_t    rs_rssiextn[IEEE80211_MAX_ANTENNA];  /* RSSI (noise floor ajusted) */
     u_int8_t    rs_isvalidrssi;                      /* rs_rssi is valid or not */
 
     enum ieee80211_phymode rs_phymode;
     int         rs_freq;
-    
+
     union {
         u_int8_t            data[8];
         u_int64_t           tsf;
     } rs_tstamp;
 
-    /* 
-     * Detail channel structure of recv frame. 
-     * It could be NULL if not available 
+    /*
+     * Detail channel structure of recv frame.
+     * It could be NULL if not available
      */
-    struct ieee80211_channel *rs_full_chan; 
+    struct ieee80211_channel *rs_full_chan;
 
     u_int8_t rs_isaggr;
     u_int8_t rs_isapsd;
@@ -284,11 +284,11 @@ typedef u_int32_t    IEEE80211_SCAN_ID;
 #define IEEE80211_VAP_SCAN            0x01000000
 #define IEEE80211_ALL_SCANS           0x04000000
 
-/** 
- * host scan bit. only relevant for host/target architecture. 
+/**
+ * host scan bit. only relevant for host/target architecture.
  * do not reuse this bit definition. target uses this .
  *
- */ 
+ */
 #define IEEE80211_HOST_SCAN           0x80000000
 #define IEEE80211_SCAN_CLASS_MASK     0xFF000000
 
@@ -312,9 +312,9 @@ typedef u_int32_t    IEEE80211_SCAN_ID;
 
 /* flag definitions passed to scan_cancel API */
 
-#define IEEE80211_SCAN_CANCEL_ASYNC 0x0 /* asynchronouly wait for scan SM to complete cancel */ 
-#define IEEE80211_SCAN_CANCEL_WAIT  0x1 /* wait for scan SM to complete cancel */ 
-#define IEEE80211_SCAN_CANCEL_SYNC  0x2 /* synchronously execute cancel scan */ 
+#define IEEE80211_SCAN_CANCEL_ASYNC 0x0 /* asynchronouly wait for scan SM to complete cancel */
+#define IEEE80211_SCAN_CANCEL_WAIT  0x1 /* wait for scan SM to complete cancel */
+#define IEEE80211_SCAN_CANCEL_SYNC  0x2 /* synchronously execute cancel scan */
 
 #ifndef EXTERNAL_USE_ONLY
 typedef bool (*ieee80211_scan_termination_check) (void *arg);
@@ -348,7 +348,7 @@ typedef struct _ieee80211_scan_params {
     int                                 num_bssid;              /* number of desired bssids */
     u_int8_t                            bssid_list[IEEE80211_SCAN_PARAMS_MAX_BSSID][IEEE80211_ADDR_LEN];
     struct ieee80211_node               *bss_node;              /* BSS node */
-    int                                 ie_len;                 /* length of the ie data to be added to probe req */ 
+    int                                 ie_len;                 /* length of the ie data to be added to probe req */
     u_int8_t                            *ie_data;               /* pointer to ie data */
     ieee80211_scan_termination_check    check_termination_function;  /* function checking for termination condition */
     void                                *check_termination_context;  /* context passed to function above */
@@ -414,23 +414,23 @@ typedef u_int32_t IEEE80211_PRIORITY_MAPPING[IEEE80211_SCAN_PRIORITY_COUNT];
 /*
  * idle time is only valid for scan type IEEE80211_SCAN_BACKGROUND.
  * if idle time is set then the scanner would change channel from BSS
- * channel to foreign channel only if both resttime is expired and 
+ * channel to foreign channel only if both resttime is expired and
  * the theres was not traffic for idletime msec on the bss channel.
  * value of 0 for idletime would cause the channel to switch from BSS
  * channel to foreign channel as soon  as the resttime is expired.
  *
- * if maxscantime is nonzero and if the scanner can not complete the 
+ * if maxscantime is nonzero and if the scanner can not complete the
  * scan in maxscantime msec then the scanner will cancel the scan and
  * post IEEE80211_SCAN_COMPLETED event with reason SCAN_TIMEDOUT.
  *
- */  
+ */
 
 /*
  * chanlist can be either ieee channels (or) frequencies.
- * if a value is less than 1000 implementation assumes it 
- * as ieee channel # otherwise implementation assumes it 
+ * if a value is less than 1000 implementation assumes it
+ * as ieee channel # otherwise implementation assumes it
  * as frequency in Mhz.
- */ 
+ */
 
 typedef enum _ieee80211_scan_event_type {
     IEEE80211_SCAN_STARTED,
@@ -482,7 +482,7 @@ typedef enum _ieee80211_scan_request_status {
  * event type is IEEE80211_SCAN_BSSID_MATCH.
  */
 
-typedef void (*ieee80211_scan_event_handler) (wlan_if_t vaphandle, ieee80211_scan_event *event, void *arg);  
+typedef void (*ieee80211_scan_event_handler) (wlan_if_t vaphandle, ieee80211_scan_event *event, void *arg);
 
 typedef struct _ieee80211_scan_info {
     ieee80211_scan_type                type;
@@ -500,7 +500,7 @@ typedef struct _ieee80211_scan_info {
     int                                repeat_probe_time;           /* time before sending second probe request */
     int                                min_beacon_count;            /* number of home AP beacons to receive before leaving the home channel */
     int                                flags;                       /* scan flags */
-    systime_t                          scan_start_time;             /* system time when last scani started */ 
+    systime_t                          scan_start_time;             /* system time when last scani started */
     int                                scanned_channels;            /* number of scanned channels */
     int                                default_channel_list_length; /* number of channels in the default channel list */
     int                                channel_list_length;         /* number of channels in the channel list used for the current scan */
@@ -525,7 +525,7 @@ typedef struct _ieee80211_scan_request_info {
 #endif /* EXTERNAL_USE_ONLY */
 
 #ifndef EXTERNAL_USE_ONLY
-typedef void (*ieee80211_acs_event_handler) (void *arg, wlan_chan_t channel);  
+typedef void (*ieee80211_acs_event_handler) (void *arg, wlan_chan_t channel);
 #endif /* EXTERNAL_USE_ONLY */
 
 #define MAX_CHAINS 3
@@ -582,7 +582,7 @@ struct ieee80211_nodestats {
     u_int32_t    ns_rx_noprivacy;        /* rx w/ wep but privacy off */
     u_int32_t    ns_rx_wepfail;          /* rx wep processing failed */
     u_int32_t    ns_rx_demicfail;        /* rx demic failed */
-       
+
     /* We log MIC and decryption failures against Transmitter STA stats.
        Though the frames may not actually be sent by STAs corresponding
        to TA, the stats are still valuable for some customers as a sort
@@ -702,7 +702,7 @@ typedef enum _ieee80211_device_param {
     IEEE80211_DEVICE_TX_CHAIN_MASK,
     IEEE80211_DEVICE_RX_CHAIN_MASK,
     IEEE80211_DEVICE_TX_CHAIN_MASK_LEGACY,
-    IEEE80211_DEVICE_RX_CHAIN_MASK_LEGACY, 
+    IEEE80211_DEVICE_RX_CHAIN_MASK_LEGACY,
     IEEE80211_DEVICE_BMISS_LIMIT,            /* # of beacon misses for HW to generate BMISS intr */
     IEEE80211_DEVICE_PROTECTION_MODE,        /* protection mode*/
     IEEE80211_DEVICE_BLKDFSCHAN,             /* block the use of DFS channels */
@@ -716,7 +716,7 @@ typedef enum _ieee80211_device_param {
     IEEE80211_DEVICE_DOTH,
     IEEE80211_DEVICE_ADDBA_MODE,
     IEEE80211_DEVICE_COUNTRYCODE,
-    IEEE80211_DEVICE_MULTI_CHANNEL,           /* turn on/off off channel support */    
+    IEEE80211_DEVICE_MULTI_CHANNEL,           /* turn on/off off channel support */
     IEEE80211_DEVICE_MAX_AMSDU_SIZE,          /* Size of AMSDU to be sent on the air */
     IEEE80211_DEVICE_P2P,                     /* Enable or Disable P2P */
     IEEE80211_DEVICE_OVERRIDE_SCAN_PROBERESPONSE_IE, /* Override scan Probe response IE, 0: Don't over-ride */
@@ -736,9 +736,9 @@ typedef enum _ieee80211_param {
     IEEE80211_SHORT_PREAMBLE,                /* short preamble on/off */
     IEEE80211_RTS_THRESHOLD,                 /* rts threshold, 0 means no rts threshold  */
     IEEE80211_FRAG_THRESHOLD,                /* fragmentation threshold, 0 means no rts threshold  */
-    IEEE80211_FIXED_RATE,                    /* 
-                                              * rate code series(0: auto rate, 32 bit value:  rate 
-                                              * codes for 4 rate series. each byte for one rate series) 
+    IEEE80211_FIXED_RATE,                    /*
+                                              * rate code series(0: auto rate, 32 bit value:  rate
+                                              * codes for 4 rate series. each byte for one rate series)
                                               */
     IEEE80211_MCAST_RATE,                    /* rate in Kbps */
     IEEE80211_TXPOWER,                       /* in 0.5db units */
@@ -782,7 +782,7 @@ typedef enum _ieee80211_param {
 #ifdef ATH_COALESCING
     IEEE80211_FEATURE_TX_COALESCING,         /* enable tx coalescing */
 #endif
-    IEEE80211_FEATURE_VAP_IND,               /* Repeater independant VAP */   
+    IEEE80211_FEATURE_VAP_IND,               /* Repeater independant VAP */
     IEEE80211_FIXED_RETRIES,                 /* fixed retries  0-4 */
     IEEE80211_SHORT_GI,                      /* short gi on/off */
     IEEE80211_HT40_INTOLERANT,
@@ -793,19 +793,19 @@ typedef enum _ieee80211_param {
     IEEE80211_STA_QUICKKICKOUT,
     IEEE80211_CHSCANINIT,
     IEEE80211_FEATURE_STAFWD,                /* dynamic AP Client  feature */
-    IEEE80211_DRIVER_CAPS,                   
+    IEEE80211_DRIVER_CAPS,
     IEEE80211_UAPSD_MAXSP,                    /* UAPSD service period setting (0:unlimited, 2,4,6) */
     IEEE80211_WEP_MBSSID,
-    IEEE80211_MGMT_RATE,                      /* ieee rate to be used for management*/ 
+    IEEE80211_MGMT_RATE,                      /* ieee rate to be used for management*/
     IEEE80211_RESMGR_VAP_AIR_TIME_LIMIT,      /* When multi-channel enabled, restrict air-time allocated to a VAP */
     IEEE80211_TDLS_MACADDR1,                  /* Upper 4 bytes of device's MAC address */
     IEEE80211_TDLS_MACADDR2,                  /* Lower 2 bytes of device's MAC address */
-    IEEE80211_TDLS_ACTION,                    /* TDLS action requested                 */ 
+    IEEE80211_TDLS_ACTION,                    /* TDLS action requested                 */
     IEEE80211_AUTO_ASSOC,
     IEEE80211_PROTECTION_MODE,                /* per VAP protection mode*/
-    IEEE80211_AUTH_INACT_TIMEOUT,             /* inactivity time while waiting for 802.11x auth to complete */ 
-    IEEE80211_INIT_INACT_TIMEOUT,             /* inactivity time while waiting for 802.11 auth/assoc to complete */ 
-    IEEE80211_RUN_INACT_TIMEOUT,              /* inactivity time when fully authed*/ 
+    IEEE80211_AUTH_INACT_TIMEOUT,             /* inactivity time while waiting for 802.11x auth to complete */
+    IEEE80211_INIT_INACT_TIMEOUT,             /* inactivity time while waiting for 802.11 auth/assoc to complete */
+    IEEE80211_RUN_INACT_TIMEOUT,              /* inactivity time when fully authed*/
     IEEE80211_PROBE_INACT_TIMEOUT,            /* inactivity counter value below which starts probing */
     IEEE80211_QBSS_LOAD,
     IEEE80211_WNM_CAP,
@@ -847,11 +847,11 @@ typedef enum _ieee80211_param {
 #ifdef ATH_SUPPORT_TxBF
     IEEE80211_TXBF_AUTO_CVUPDATE,             /* auto CV update enable */
     IEEE80211_TXBF_CVUPDATE_PER,              /* per threshold to initial CV update*/
-#endif  
+#endif
     IEEE80211_MAX_CLIENT_NUMBERS,
 	IEEE80211_SMARTNET,
     IEEE80211_FEATURE_MFP_TEST,               /* MFP test */
-	IEEE80211_WEATHER_RADAR, 				  /* weather radar channel skip */
+	IEEE80211_WEATHER_RADAR,				  /* weather radar channel skip */
     IEEE80211_WEP_KEYCACHE,                   /* WEP KEYCACHE is enable */
     IEEE80211_SEND_DEAUTH,                  /* send deauth instead of disassoc while doing interface down  */
     IEEE80211_SET_TXPWRADJUST,
@@ -890,7 +890,7 @@ typedef enum _ieee80211_privacy_filter_packet_type {
 
 typedef struct _ieee80211_privacy_excemption_filter {
     u_int16_t                               ether_type; /* type of ethernet to apply this filter, in host byte order*/
-    ieee80211_privacy_filter                filter_type; 
+    ieee80211_privacy_filter                filter_type;
     ieee80211_privacy_filter_packet_type    packet_type;
 } ieee80211_privacy_exemption;
 
@@ -957,14 +957,14 @@ typedef struct _ieee80211_keyval {
     u_int8_t                *keydata;
 #ifdef ATH_SUPPORT_WAPI
     u_int8_t                key_used;       /*index for WAPI rekey labeling*/
-#endif    
+#endif
 } ieee80211_keyval;
 
 #define IEEE80211_AES_CMAC_LEN     128
 typedef enum _ieee80211_rsn_param {
     IEEE80211_UCAST_CIPHER_LEN,
     IEEE80211_MCAST_CIPHER_LEN,
-    IEEE80211_MCASTMGMT_CIPHER_LEN,    
+    IEEE80211_MCASTMGMT_CIPHER_LEN,
     IEEE80211_KEYMGT_ALGS,
     IEEE80211_RSN_CAPS
 } ieee80211_rsn_param;
@@ -992,7 +992,7 @@ typedef enum _ieee80211_frame_type {
     IEEE80211_FRAME_TYPE_ASSOCREQ,
     IEEE80211_FRAME_TYPE_ASSOCRESP,
     IEEE80211_FRAME_TYPE_AUTH
-} ieee80211_frame_type; 
+} ieee80211_frame_type;
 
 #define IEEE80211_FRAME_TYPE_MAX    (IEEE80211_FRAME_TYPE_AUTH+1)
 
@@ -1025,7 +1025,7 @@ typedef struct _ieee80211_reset_request {
 } ieee80211_reset_request;
 
 #define IEEE80211_MSG_MAX 63
-#define IEEE80211_MSG_SMARTANT 7            /* Bit 7 (0x80)for Smart Antenna debug */ 
+#define IEEE80211_MSG_SMARTANT 7            /* Bit 7 (0x80)for Smart Antenna debug */
 enum {
     /* IEEE80211_PARAM_DBG_LVL */
     IEEE80211_MSG_TDLS      = 0,            /* TDLS */
@@ -1076,22 +1076,22 @@ enum {
 };
 
 /* verbosity levels */
-#define     IEEE80211_VERBOSE_OFF                  100 
+#define     IEEE80211_VERBOSE_OFF                  100
 #define     IEEE80211_VERBOSE_FORCE               1
 #define     IEEE80211_VERBOSE_SERIOUS             2
 #define     IEEE80211_VERBOSE_NORMAL              3
 #define     IEEE80211_VERBOSE_LOUD                4
 #define     IEEE80211_VERBOSE_DETAILED            5
 #define     IEEE80211_VERBOSE_COMPLEX             6
-#define     IEEE80211_VERBOSE_FUNCTION            7 
+#define     IEEE80211_VERBOSE_FUNCTION            7
 #define     IEEE80211_VERBOSE_TRACE               8
 
-#define IEEE80211_DEBUG_DEFAULT IEEE80211_MSG_DEBUG     
+#define IEEE80211_DEBUG_DEFAULT IEEE80211_MSG_DEBUG
 
 /*
  * the lower 4 bits of the msg flags are used for extending the
- * debug flags. 
- */ 
+ * debug flags.
+ */
 
 /*
  * flag defintions for wlan_mlme_stop_bss(vap) API.
@@ -1162,7 +1162,7 @@ struct ieee80211_mac_stats {
 
     u_int64_t   ims_tx_datapyld_bytes;  /* data payload bytes successfully
                                            transmitted */
-    u_int64_t   ims_rx_datapyld_bytes;  /* data payload successfully 
+    u_int64_t   ims_rx_datapyld_bytes;  /* data payload successfully
                                            received */
 
     /* Decryption errors */
@@ -1179,7 +1179,7 @@ struct ieee80211_mac_stats {
     u_int64_t   ims_rx_ccmpformat;  /* rx format bad (CCMP) */
     u_int64_t   ims_rx_ccmpmic;     /* rx MIC check failed (CCMP) */
 /*this file can be included by applications as 80211stats that has no such MACRO definition*/
-//#if ATH_SUPPORT_WAPI 
+//#if ATH_SUPPORT_WAPI
     u_int64_t   ims_rx_wpireplay;  /* rx seq# violation (WPI) */
     u_int64_t   ims_rx_wpimic;     /* rx MIC check failed (WPI) */
 //#endif
@@ -1366,7 +1366,7 @@ struct ieee80211_app_ie_t {
         u_int8_t        *ie;
 };
 
-/* 
+/*
  * MAC ACL operations.
  */
 enum {
diff --git a/CORE/SERVICES/COMMON/if_llc.h b/CORE/SERVICES/COMMON/if_llc.h
index f1fb9724390b..557a1ad528c1 100644
--- a/CORE/SERVICES/COMMON/if_llc.h
+++ b/CORE/SERVICES/COMMON/if_llc.h
@@ -128,7 +128,7 @@ struct frmrinfo {
 #define	llc_fid			llc_un.type_u.format_id
 #define	llc_class		llc_un.type_u.class
 #define	llc_window		llc_un.type_u.window_x2
-#define	llc_frmrinfo 		llc_un.type_frmr.frmr_rej_pdu0
+#define	llc_frmrinfo		llc_un.type_frmr.frmr_rej_pdu0
 #define	llc_frmr_pdu0		llc_un.type_frmr.frmr_rej_pdu0
 #define	llc_frmr_pdu1		llc_un.type_frmr.frmr_rej_pdu1
 #define	llc_frmr_control	llc_un.type_frmr.frmr_control
diff --git a/CORE/SERVICES/COMMON/isoc_hw_desc.h b/CORE/SERVICES/COMMON/isoc_hw_desc.h
index 877fcd007e3c..7e4e7df2fc69 100644
--- a/CORE/SERVICES/COMMON/isoc_hw_desc.h
+++ b/CORE/SERVICES/COMMON/isoc_hw_desc.h
@@ -46,7 +46,7 @@
 * @brief isoc_rx_bd_t - the format of the "RX BD" (rx buffer descriptor)
 */
 
-typedef struct 
+typedef struct
 {
     /* 0x00 */
 #ifdef BIG_ENDIAN_HOST
@@ -97,7 +97,7 @@ typedef struct
     0 - No decryption required */
     A_UINT32 robust_mgmt:1;
 
-    /** 
+    /**
     This bit is only in Virgo2.0/libra it is reserved in Virgo 1.0
     This 1-bit field indicates to DPU Unicast/BC/MC packet
     0 - Unicast packet
@@ -112,20 +112,20 @@ typedef struct
     In virgo2.0/libra it is 3bits for the BC/MC packets */
     A_UINT32 rx_key_id:3;
 
-    /**  (Only used by the DPU)    
+    /**  (Only used by the DPU)
     No encryption/decryption
     0: No action
     1: DPU will not encrypt/decrypt the frame, and discard any encryption
     related settings in the PDU descriptor. */
     A_UINT32 dpu_no_encrypt:1;
 
-    /** 
+    /**
     This is only available in libra/virgo2.0  it is reserved for virgo1.0
     This bit is filled by RXP and modified by ADU
     This bit indicates to ADU/UMA module that the packet requires 802.11n to
     802.3 frame translation. Once ADU/UMA is done with translation they
     overwrite it with 1'b0/1'b1 depending on how the translation resulted
-    When used by ADU 
+    When used by ADU
     0 - No frame translation required
     1 - Frame Translation required
     When used by SW
@@ -135,9 +135,9 @@ typedef struct
     A_UINT32 frame_translate:1;
 
     /** (Only used by the DPU)
-    BD Type 
+    BD Type
     00: 'Generic BD', as indicted above
-    01: De-fragmentation format 
+    01: De-fragmentation format
     10-11: Reserved for future use. */
     A_UINT32 bd_type:2;
 
@@ -173,7 +173,7 @@ typedef struct
 #ifdef QCA_ISOC_PRONTO
     A_UINT32 adu_feedback:7;
     //ToDO: Add meaning of this bit
-    A_UINT32 dpu_magic_packet: 1; 
+    A_UINT32 dpu_magic_packet: 1;
 #else
     A_UINT32 adu_feedback:8;
 #endif //QCA_ISOC_PRONTO
@@ -183,8 +183,8 @@ typedef struct
 
 #else
     A_UINT32 dpu_feedback:8;
-#ifdef QCA_ISOC_PRONTO 
-    A_UINT32 dpu_magic_packet: 1; 
+#ifdef QCA_ISOC_PRONTO
+    A_UINT32 dpu_magic_packet: 1;
     A_UINT32 adu_feedback:7;
 #else
     A_UINT32 adu_feedback:8;
@@ -213,24 +213,24 @@ typedef struct
     /* 0x0c */
 #ifdef BIG_ENDIAN_HOST
 
-    /** The length (in number of bytes) of the MPDU header. 
+    /** The length (in number of bytes) of the MPDU header.
     Limitation: The MPDU header offset + MPDU header length can never go beyond
     the end of the first PDU */
     A_UINT32 mpdu_header_length:8;
 
-    /** The start byte number of the MPDU header. 
+    /** The start byte number of the MPDU header.
     The byte numbering is done in the BE format. Word 0x0, bits [31:24] has
     byte index 0. */
     A_UINT32 mpdu_header_offset:8;
 
-    /** The start byte number of the MPDU data. 
+    /** The start byte number of the MPDU data.
     The byte numbering is done in the BE format. Word 0x0, bits [31:24] has
     byte index 0. Note that this offset can point all the way into the first
     linked PDU.
     Limitation: MPDU DATA OFFSET can not point into the 2nd linked PDU */
     A_UINT32 mpdu_data_offset:9;
 
-    /** The number of PDUs linked to the BD. 
+    /** The number of PDUs linked to the BD.
     This field should always indicate the correct amount. */
     A_UINT32 pdu_count:7;
 #else
@@ -244,13 +244,13 @@ typedef struct
     /* 0x10 */
 #ifdef BIG_ENDIAN_HOST
 
-    /** This is the length (in number of bytes) of the entire MPDU 
+    /** This is the length (in number of bytes) of the entire MPDU
     (header and data). Note that the length does not include FCS field. */
     A_UINT32 mpdu_length:16;
 
     A_UINT32 reserved3: 3;
     //ToDO: Add meaning of this bit
-    A_UINT32 rx_dxe_priority_routing:1; 
+    A_UINT32 rx_dxe_priority_routing:1;
 
     /** Traffic Identifier
     Indicates the traffic class the frame belongs to. For non QoS frames,
@@ -276,7 +276,7 @@ typedef struct
     A_UINT32 sw_flag_discard:1;
     A_UINT32 sw_flag_forward:1;
     A_UINT32 tid:4;
-    A_UINT32 rx_dxe_priority_routing:1; 
+    A_UINT32 rx_dxe_priority_routing:1;
     A_UINT32 reserved3: 3;
     A_UINT32 mpdu_length:16;
 #endif
@@ -401,7 +401,7 @@ typedef struct
 #ifdef BIG_ENDIAN_HOST
     /** The bits from the PMI command as received from the PHY RX. */
     A_UINT32 pmi_cmd24to25:16;
-    
+
     /* 16-bit CSU Checksum value for the fragmented receive frames */
     A_UINT32 csu_checksum:16;
 #else
@@ -626,7 +626,7 @@ typedef enum
 
     ISOC_RX_OPCODE_DROPCUR         = 9, /* not used? */
 
-    ISOC_RX_OPCODE_MAX 
+    ISOC_RX_OPCODE_MAX
 } isoc_rx_opcode;
 
 
@@ -639,7 +639,7 @@ enum {
 /* dpu_feedback defined */
 enum {
     ISOC_DPU_FEEDBACK_MULTI_ERROR = 0,   /* DPU detected multiple errors. Should never occur. */
-    ISOC_DPU_FEEDBACK_BAD_TAG,           /* Tag fields in the BD and associated DPU descriptor did not match. */       
+    ISOC_DPU_FEEDBACK_BAD_TAG,           /* Tag fields in the BD and associated DPU descriptor did not match. */
     ISOC_DPU_FEEDBACK_BAD_BD,            /*  At least one of the following conditions applied:
     * The BD type was not 0 (normal BD) in a TX packet.
     * The BD type was not either 0 or 1 (normal or defrag BD) in an RX packet.
@@ -647,7 +647,7 @@ enum {
     * The MPDU header was not located entirely within the BD.
     * The MPDU Data Offset pointed past the end of the first PDU.
     */
-    ISOC_DPU_FEEDBACK_BAD_TKIP_MIC,     /* The TKIP MIC of a received packet is incorrect. */    
+    ISOC_DPU_FEEDBACK_BAD_TKIP_MIC,     /* The TKIP MIC of a received packet is incorrect. */
     ISOC_DPU_FEEDBACK_BAD_DECRYPT,      /* Decryption of an RX fragment has failed.This error occurs only if none of the following more specific conditions applied. */
     ISOC_DPU_FEEDBACK_ENVELOPE_ONLY,    /* The received protected fragment had exactly sufficient MPDU data for an empty cryptographic envelope of the selected encryption mode. */
     ISOC_DPU_FEEDBACK_ENVELOPE_PART,    /* The received protected fragment had less MPDU data than required for the cryptographic envelope of the selected encryption mode. */
@@ -665,7 +665,7 @@ enum {
 /**
 * @brief isoc_tx_bd_t - the format of the "TX BD" (tx buffer descriptor)
 */
-typedef struct 
+typedef struct
 {
     /* byte offset 0x0 */
 #ifdef BIG_ENDIAN_HOST
@@ -685,13 +685,13 @@ typedef struct
     /** Reserved  */
     A_UINT32 reserved0:2;
 
-    /** Set to '1' to terminate the current AMPDU session. Added based on the 
+    /** Set to '1' to terminate the current AMPDU session. Added based on the
     request for WiFi Display */
     A_UINT32 terminate_ampdu:1;
 
-    /** Bssid index to indicate ADU to use which of the 4 default MAC address 
-    to use while 802.3 to 802.11 translation in case search in ADU UMA table 
-    fails. The default MAC address should be appropriately programmed in the 
+    /** Bssid index to indicate ADU to use which of the 4 default MAC address
+    to use while 802.3 to 802.11 translation in case search in ADU UMA table
+    fails. The default MAC address should be appropriately programmed in the
     uma_tx_default_wmacaddr_u(_1,_2,_3) and uma_tx_default_wmacaddr_l(_1,_2,_3)
      registers */
     A_UINT32 uma_bssid_idx:2;
@@ -708,7 +708,7 @@ typedef struct
 
     /** Enable/Disable CSU on TX direction.
     0: Disable Checksum Unit (CSU) for Transmit.
-    1: Enable 
+    1: Enable
     */
     A_UINT32 csu_tx_enable:1;
 
@@ -777,16 +777,16 @@ typedef struct
 
     /**
     * This bit indicates to ADU/UMA module that the packet requires 802.11n
-    * to 802.3 frame translation. When used by ADU 
+    * to 802.3 frame translation. When used by ADU
     * 0 - No frame translation required
     * 1 - Frame Translation required
     */
     A_UINT32 frame_translate: 1;
 
     /**
-    * BD Type 
+    * BD Type
     * 00: 'Generic BD', as indicted above
-    * 01: De-fragmentation format 
+    * 01: De-fragmentation format
     * 10-11: Reserved for future use.
     */
     A_UINT32 bd_type: 2;
@@ -794,12 +794,12 @@ typedef struct
     A_UINT32 bd_type:               2;
     A_UINT32 frame_translate:       1;
     A_UINT32 dpu_no_encrypt:        1;
-    A_UINT32 fw_tx_complete_intr:   1; 
+    A_UINT32 fw_tx_complete_intr:   1;
     A_UINT32 tx_complete_intr:      1;
     A_UINT32 reserved1:             1;
     A_UINT32 not_unicast:           1;
     A_UINT32 robust_mgmt:           1;
-    
+
     A_UINT32 csu_no_valid_header:1;
     A_UINT32 csu_tl_checksum_generated:1;
     A_UINT32 csu_enable_ip_checksum:1;
@@ -810,7 +810,7 @@ typedef struct
     A_UINT32 uma_bssid_idx:2;
     A_UINT32 terminate_ampdu:1;
     A_UINT32 reserved0:2;
-    
+
     A_UINT32 dpu_signature:         3;
     A_UINT32 dpu_routing_flag:      8;
 #endif
@@ -870,12 +870,12 @@ typedef struct
     */
     A_UINT32 mpdu_header_offset: 8;
 
-    /** 
+    /**
     * The start byte number of the MPDU data.
     * The byte numbering is done in the BE format.
     * Word 0x0, bits [31:24] has byte index 0.
     * Note that this offset can point all the way into the
-    * first linked PDU. 
+    * first linked PDU.
     * Limitation: MPDU DATA OFFSET can not point into the
     * 2nd linked PDU
     */
@@ -898,7 +898,7 @@ typedef struct
 
     /* byte offset 0x10 */
 #ifdef BIG_ENDIAN_HOST
-    /** 
+    /**
     * This covers MPDU header length + MPDU data length.
     * This does not include FCS.
     * For single frame transmission, PSDU size is mpdu_length + 4.
@@ -949,7 +949,7 @@ typedef struct
     */
     A_UINT32 dpu_desc_idx: 8;
 
-    /** 
+    /**
     * The STAid of the RA address, a.k.a. peer ID
     */
     A_UINT32 sta_index: 8;
@@ -971,7 +971,7 @@ typedef struct
     */
     A_UINT32 bd_rate: 2;
 
-    /** 
+    /**
     * Which HW tx queue the frame should go into
     */
     A_UINT32 queue_id: 5;
@@ -1004,11 +1004,11 @@ typedef struct
 
     /* byte offset 0x28 */
 #ifdef BIG_ENDIAN_HOST
-    /** 10 bit value to indicate the start of TCP UDP frame relative to 
+    /** 10 bit value to indicate the start of TCP UDP frame relative to
              * the first IP frame header */
     A_UINT32 csu_tcp_udp_start_offset:10;
 
-    /** 16 bit pseudo header for TCP UDP used by CSU to generate TCP/UDP 
+    /** 16 bit pseudo header for TCP UDP used by CSU to generate TCP/UDP
      * frame checksum */
     A_UINT32 csu_pseudo_header_checksum:16;
 
@@ -1195,4 +1195,3 @@ static inline void
 }
 
 #endif /* _ISOC_HW_DESC__H_ */
-
diff --git a/CORE/SERVICES/COMMON/ol_cfg.h b/CORE/SERVICES/COMMON/ol_cfg.h
index 047f54558561..c7797137d1c8 100644
--- a/CORE/SERVICES/COMMON/ol_cfg.h
+++ b/CORE/SERVICES/COMMON/ol_cfg.h
@@ -241,7 +241,7 @@ int ol_cfg_netbuf_frags_max(ol_pdev_handle pdev);
  *  transmit frames until the target explicitly indicates it is finished
  *  transmitting them, or if it should free its copy as soon as the
  *  tx frame is downloaded to the target.
- *  
+ *
  * @param pdev - handle to the physical device
  * @return
  *      0 -> retain the tx frame until the target indicates it is done
@@ -253,14 +253,14 @@ int ol_cfg_tx_free_at_download(ol_pdev_handle pdev);
 
 
 /**
- * @brief Low water mark for target tx credit. 
- * Tx completion handler is invoked to reap the buffers when the target tx 
+ * @brief Low water mark for target tx credit.
+ * Tx completion handler is invoked to reap the buffers when the target tx
  * credit goes below Low Water Mark.
  */
 #define OL_CFG_NUM_MSDU_REAP 512
 #define ol_cfg_tx_credit_lwm(pdev)                                             \
         ((CFG_TGT_NUM_MSDU_DESC >  OL_CFG_NUM_MSDU_REAP) ?                     \
-                        (CFG_TGT_NUM_MSDU_DESC -  OL_CFG_NUM_MSDU_REAP) : 0)   
+                        (CFG_TGT_NUM_MSDU_DESC -  OL_CFG_NUM_MSDU_REAP) : 0)
 
 /**
  * @brief In a HL system, specify the target initial credit count.
@@ -311,12 +311,12 @@ int ol_cfg_tx_download_size(ol_pdev_handle pdev);
  *   logic to time out stale fragments is moved to the host.
  *
  * @param pdev - handle to the physical device
- * @return 
+ * @return
  *  0 -> target is responsible non-aggregate duplicate detection and
- *          timing out stale fragments. 
+ *          timing out stale fragments.
  *
  *  1 -> host is responsible non-aggregate duplicate detection and
- *          timing out stale fragments. 
+ *          timing out stale fragments.
  */
 int ol_cfg_rx_host_defrag_timeout_duplicate_check(ol_pdev_handle pdev);
 
diff --git a/CORE/SERVICES/COMMON/ol_ctrl_addba_api.h b/CORE/SERVICES/COMMON/ol_ctrl_addba_api.h
index 159d7323fda3..c30255d1ef5f 100644
--- a/CORE/SERVICES/COMMON/ol_ctrl_addba_api.h
+++ b/CORE/SERVICES/COMMON/ol_ctrl_addba_api.h
@@ -38,37 +38,37 @@ typedef struct S_OL_CTRL_ADDBA_CTX *ol_ctrl_addba_handle;
 
 /**
  * @brief ol_ctrl_addba_attach : Allocate OL ADDBA Context for managing ADDBA Negotiation Process
- * 
+ *
  * @param[in] void
- * 
- * @return ol_txrx_addba_handle 
+ *
+ * @return ol_txrx_addba_handle
  */
 ol_ctrl_addba_handle ol_ctrl_addba_attach(adf_os_device_t osdev,void * ni,A_UINT32 vdev_id,u_int8_t *mac_addr,wmi_unified_t wmi_handle);
 
 /**
  * @brief ol_ctrl_addba_detach : Free OL ADDBA Context and cleanup
- * 
- * @param[in] 
- * 
- * @return void 
+ *
+ * @param[in]
+ *
+ * @return void
  */
 void ol_ctrl_addba_detach(ol_ctrl_addba_handle ol_addba_handle);
 
 /**
- * @brief ol_ctrl_addba_init : Initialize aggr state for the Tx / Rx 
- * 
+ * @brief ol_ctrl_addba_init : Initialize aggr state for the Tx / Rx
+ *
 * @param ni      : the Node for which the aggr params need to be initialized
 
-* @return void 
+* @return void
 */
 void ol_ctrl_addba_init(ol_ctrl_addba_handle ol_addba_handle,adf_os_device_t osdev,void *ni,A_UINT32 vdev_id,u_int8_t *mac_addr,wmi_unified_t wmi_handle);
 
 /**
  * @brief ol_addba_cleanup : DeInitialize aggr state for the Tx / Rx
-* 
+*
 * @param ni      : the Node for which the aggr params need to be De-initialized
-* 
-* @return void 
+*
+* @return void
 */
 void ol_ctrl_addba_cleanup(ol_ctrl_addba_handle ol_addba_handle);
 
@@ -76,13 +76,13 @@ void ol_ctrl_addba_cleanup(ol_ctrl_addba_handle ol_addba_handle);
  * @brief ol_ctrl_addba_request_setup : (Initiator Role) umac needs to call this API to get
  * the Block ack request parameters and use them to construct Addba request.
  *Setsup ADDBA Request Parameters and Start ADDBA Timer for Retry/Cancel ADDBA negotiation.
- * 
+ *
 * @param tidno      : the TID number for this ADDBA request
 * @param baparamset : the data structure for lmac to fill in ADDBA request info
 * @param batimeout  : the pointer for lmac to fill in ADDBA timeout
 * @param basequencectrl : the data structure for lmac to fill in frame sequence control info
-* @param buffersize : BAW(block ack window size) for transmit AMPDU. 
-* @return void 
+* @param buffersize : BAW(block ack window size) for transmit AMPDU.
+* @return void
 */
 void ol_ctrl_addba_request_setup(ol_ctrl_addba_handle ol_addba_handle,u_int8_t tidno,
                        struct ieee80211_ba_parameterset *baparamset,
@@ -92,14 +92,14 @@ void ol_ctrl_addba_request_setup(ol_ctrl_addba_handle ol_addba_handle,u_int8_t t
 
 /**
  * @brief ol_ctrl_addba_response_setup : (Responder Role)Setup ADDBA Response Parameters
- * 
+ *
 * @param tidno      : the TID number for this ADDBA response
 * @param dialogtoken: The dialog token for the response (filled by lmac)
 * @param statuscode : The status code for this response (filled by lmac)
 * @param baparamset : The BA parameters for this response (filled by lmac)
 * @param batimeout  : The BA timeout for this response (filled by lmac)
- * 
- * @return void 
+ *
+ * @return void
  */
 void ol_ctrl_addba_response_setup(ol_ctrl_addba_handle ol_addba_handle,u_int8_t tidno, u_int8_t *dialogtoken,
                        u_int16_t *statuscode,
@@ -110,7 +110,7 @@ void ol_ctrl_addba_response_setup(ol_ctrl_addba_handle ol_addba_handle,u_int8_t
  * @brief ol_ctrl_addba_request_process : (Responder Role)Process ADDBA Request From Peer
 * save response information in per-TID data structure
 * umac needs to call this function when it receives addba request.
- * 
+ *
  * @param dialogtoken : the dialog token saved for future ADDBA response
  * @param baparamset  : pointer to the BA parameters from  received the ADDBA request
  * @param batimeout   : the BA timeout value from ADDBA request
@@ -126,12 +126,12 @@ int  ol_ctrl_addba_request_process(ol_ctrl_addba_handle ol_addba_handle,u_int8_t
 /**
  * @brief ol_ctrl_addba_response_process : (Initiator Role) Process ADDBA Response and store Negotiated ADDBA Params.
  *                                                       Send WMI Command to FW to Enable Aggregation for TID if all ok.
- * 
+ *
 * @param statuscode : the status code from the received ADDBA response
 * @param baparamset : pointer to the BA parameter structure from the received  ADDBA response
 * @param batimeout  : the BA timeout value from the received ADDBA response
- * 
- * @return void 
+ *
+ * @return void
  */
 void  ol_ctrl_addba_response_process(ol_ctrl_addba_handle ol_addba_handle,u_int16_t statuscode,
                        struct ieee80211_ba_parameterset *baparamset,
@@ -139,28 +139,28 @@ void  ol_ctrl_addba_response_process(ol_ctrl_addba_handle ol_addba_handle,u_int1
 
 /**
  * @brief ol_ctrl_addba_clear : Clear ADD BA Session for  all the TID's in Session
- * 
- * @param[in] 
- * 
- * @return void 
+ *
+ * @param[in]
+ *
+ * @return void
  */
 void  ol_ctrl_addba_clear(ol_ctrl_addba_handle ol_addba_handle);
 
 /**
  * @brief ol_ctrl_delba_process : (Responder Role)Process DELBA Request from Peer TID
  *umac needs to call this function when it receives DELBA.
- * 
+ *
  * @param delbaparamset : point to the DELBA parameter structure
  * @param reasoncode	: reason code from this DELBA
- * 
- * @return void 
+ *
+ * @return void
  */
 void  ol_ctrl_delba_process(ol_ctrl_addba_handle ol_addba_handle,struct ieee80211_delba_parameterset *delbaparamset,
                         u_int16_t reasoncode);
 
 /**
  * @brief ol_ctrl_addba_get_status : Returns Status of ADDBA Negotiation with Peer for  TID
- * 
+ *
  * @param tidno : the TID number
  * @return ADDBA status code
  */
diff --git a/CORE/SERVICES/COMMON/ol_htt_api.h b/CORE/SERVICES/COMMON/ol_htt_api.h
index df9911d5bb64..7d5989e1e0f6 100644
--- a/CORE/SERVICES/COMMON/ol_htt_api.h
+++ b/CORE/SERVICES/COMMON/ol_htt_api.h
@@ -188,7 +188,7 @@ htt_h2t_sync_msg(htt_pdev_handle htt_pdev, u_int8_t sync_cnt);
 
 int
 htt_h2t_aggr_cfg_msg(htt_pdev_handle htt_pdev,
-                     int max_subfrms_ampdu, 
+                     int max_subfrms_ampdu,
                      int max_subfrms_amsdu);
 
 /**
@@ -205,7 +205,7 @@ htt_h2t_aggr_cfg_msg(htt_pdev_handle htt_pdev,
  */
 int
 htt_h2t_dbg_stats_get(
-    struct htt_pdev_t *pdev, 
+    struct htt_pdev_t *pdev,
     u_int32_t stats_type_upload_mask,
     u_int32_t stats_type_reset_mask,
     u_int8_t cfg_stats_type,
diff --git a/CORE/SERVICES/COMMON/ol_htt_rx_api.h b/CORE/SERVICES/COMMON/ol_htt_rx_api.h
index c77ed552e2b3..373674ee6a50 100644
--- a/CORE/SERVICES/COMMON/ol_htt_rx_api.h
+++ b/CORE/SERVICES/COMMON/ol_htt_rx_api.h
@@ -72,7 +72,7 @@
  * @param rx_ind_msg - the netbuf containing the rx indication message
  * @return
  *      1 - the message's rx flush command is valid and should be processed
- *          before processing new rx MPDUs, 
+ *          before processing new rx MPDUs,
  *      -OR-
  *      0 - the message's rx flush command is invalid and should be ignored
  */
@@ -334,7 +334,7 @@ htt_rx_mpdu_desc_tsf32(
  */
 char *
 htt_rx_mpdu_wifi_hdr_retrieve(
-    htt_pdev_handle pdev, 
+    htt_pdev_handle pdev,
     void *mpdu_desc);
 
 /**
@@ -590,7 +590,7 @@ extern a_bool_t
  * 0 - no buffer chaining
  * 1 - buffers are chained
  */
-extern int 
+extern int
 (*htt_rx_amsdu_pop)(
     htt_pdev_handle pdev,
     adf_nbuf_t rx_ind_msg,
@@ -736,16 +736,16 @@ htt_rx_msdu_buff_replenish(htt_pdev_handle pdev);
  *  a separate wbuf for delivery to the network stack. For delivery to the
  *  monitor mode interface they need to be restitched into an MPDU. This
  *  function does this. Also updates the RX status if the MPDU starts
- *  a new PPDU 
+ *  a new PPDU
  *
  * @param pdev - the HTT instance the rx data was received on
  * @param head_msdu - network buffer handle, which points to the first MSDU
  *      in the list. This is a NULL terminated list
  * @param rx_staus - pointer to the status associated with this MPDU.
- *      Updated only if there is a new PPDU and new status associated with it 
+ *      Updated only if there is a new PPDU and new status associated with it
  * @param clone_not_reqd - If set the MPDU linking destroys the passed in
- *      list, else operates on a cloned nbuf 
- * @return network buffer handle to the MPDU  
+ *      list, else operates on a cloned nbuf
+ * @return network buffer handle to the MPDU
  */
 adf_nbuf_t
 htt_rx_restitch_mpdu_from_msdus(
@@ -782,7 +782,7 @@ htt_rx_msdu_rx_desc_size_hl(
 
 /**
  * @brief populates vowext stats by processing RX desc.
- * @param msdu - network buffer handle 
+ * @param msdu - network buffer handle
  * @param vowstats - handle to vow ext stats.
  */
 void htt_rx_get_vowext_stats(adf_nbuf_t msdu,struct vow_extstats *vowstats);
diff --git a/CORE/SERVICES/COMMON/ol_htt_tx_api.h b/CORE/SERVICES/COMMON/ol_htt_tx_api.h
index 3a1b271ff70f..916a010db672 100644
--- a/CORE/SERVICES/COMMON/ol_htt_tx_api.h
+++ b/CORE/SERVICES/COMMON/ol_htt_tx_api.h
@@ -305,12 +305,12 @@ htt_tx_send_batch(
 
 
 /* The htt scheduler for queued packets in htt
- * htt when unable to send to HTC because of lack of resource 
- * forms a nbuf queue which is flushed when tx completion event from 
- * target is recieved 
+ * htt when unable to send to HTC because of lack of resource
+ * forms a nbuf queue which is flushed when tx completion event from
+ * target is recieved
  */
 
-void 
+void
 htt_tx_sched(htt_pdev_handle pdev);
 
 
@@ -391,15 +391,15 @@ htt_tx_desc_init(
 
     word0 = (u_int32_t *) htt_tx_desc;
     word1 = word0 + 1;
-    /* 
-     * word2 is frag desc pointer 
-     * word3 is peer_id 
+    /*
+     * word2 is frag desc pointer
+     * word3 is peer_id
      */
     word3 = word0 + 3; // Dword 3
 
     *word0 = 0;
-                
-    HTT_H2T_MSG_TYPE_SET(*word0, HTT_H2T_MSG_TYPE_TX_FRM);    
+
+    HTT_H2T_MSG_TYPE_SET(*word0, HTT_H2T_MSG_TYPE_TX_FRM);
     HTT_TX_DESC_PKT_TYPE_SET(*word0, msdu_info->info.l2_hdr_type);
     HTT_TX_DESC_VDEV_ID_SET(*word0, msdu_info->info.vdev_id);
     HTT_TX_DESC_EXT_TID_SET(*word0, msdu_info->info.ext_tid);
diff --git a/CORE/SERVICES/COMMON/ol_if_athvar.h b/CORE/SERVICES/COMMON/ol_if_athvar.h
index a6495ea58b7b..a2553075b89b 100644
--- a/CORE/SERVICES/COMMON/ol_if_athvar.h
+++ b/CORE/SERVICES/COMMON/ol_if_athvar.h
@@ -69,7 +69,7 @@ typedef enum _ATH_BIN_FILE {
 } ATH_BIN_FILE;
 
 typedef enum _ol_target_status  {
-     OL_TRGET_STATUS_CONNECTED = 0,    /* target connected */ 
+     OL_TRGET_STATUS_CONNECTED = 0,    /* target connected */
      OL_TRGET_STATUS_RESET,        /* target got reset */
      OL_TRGET_STATUS_EJECT,        /* target got ejected */
      OL_TRGET_STATUS_SUSPEND   /*target got suspend*/
@@ -100,37 +100,37 @@ struct ol_ath_stats {
 
 struct ol_softc {
     /*
-     * handle for code that uses the osdep.h version of OS 
+     * handle for code that uses the osdep.h version of OS
      * abstraction primitives
      */
     osdev_t         sc_osdev;
 
-    /* 
-     * handle for code that uses adf version of OS 
-     * abstraction primitives 
+    /*
+     * handle for code that uses adf version of OS
+     * abstraction primitives
      */
     adf_os_device_t   adf_dev;
-    
+
     struct ol_version      version;
 
     /* Packet statistics */
     struct ol_ath_stats     pkt_stats;
-    
+
     u_int32_t target_type;  /* A_TARGET_TYPE_* */
     u_int32_t target_version;
     u_int8_t  crm_version_string[64];  /* store pHalStartRsp->startRspParams.wcnssCrmVersionString */
     u_int8_t  wlan_version_string[64]; /* store pHalStartRsp->startRspParams.wcnssWlanVersionString */
-    ol_target_status  target_status; /* target status */ 
+    ol_target_status  target_status; /* target status */
     bool             is_sim;   /* is this a simulator */
-    u_int8_t *cal_in_flash; /* calibration data is stored in flash */             
+    u_int8_t *cal_in_flash; /* calibration data is stored in flash */
     void *cal_mem; /* virtual address for the calibration data on the flash */
 
     WLAN_INIT_STATUS    wlan_init_status; /* status of target init */
 
     /* BMI info */
     void            *bmi_ol_priv; /* OS-dependent private info for BMI */
-    bool            bmiDone;    
-    bool            bmiUADone;    
+    bool            bmiDone;
+    bool            bmiUADone;
     u_int8_t        *pBMICmdBuf;
     dma_addr_t      BMICmd_pa;
     OS_DMA_MEM_CONTEXT(bmicmd_dmacontext)
@@ -165,7 +165,7 @@ struct ol_softc {
         u_int32_t           length;
         adf_os_size_t       offset;
         u_int8_t            currentSeq;
-        u_int8_t            expectedSeq; 
+        u_int8_t            expectedSeq;
     } utf_event_info;
 
     struct ol_wow_info      *scn_wowInfo;
@@ -176,7 +176,7 @@ struct ol_softc {
     bool                    enableuartprint;    /* enable uart/serial prints from target */
     bool                    enablefwlog;        /* enable fwlog */
     bool                    enablesinglebinary; /* Use single binary for FW */
-    HAL_REG_CAPABILITIES hal_reg_capabilities;    
+    HAL_REG_CAPABILITIES hal_reg_capabilities;
     struct ol_regdmn *ol_regdmn_handle;
     u_int8_t                bcn_mode;
     u_int8_t                arp_override;
@@ -188,7 +188,7 @@ struct ol_softc {
     int16_t               chan_nf;            /* noise_floor */
     u_int32_t               min_tx_power;
     u_int32_t               max_tx_power;
-    u_int32_t               txpowlimit2G;              
+    u_int32_t               txpowlimit2G;
     u_int32_t               txpowlimit5G;
     u_int32_t               txpower_scale;
     u_int32_t               chan_tx_pwr;
@@ -324,7 +324,7 @@ wmi_unified_node_set_param(wmi_unified_t wmi_handle, u_int8_t *peer_addr,u_int32
         u_int32_t param_val,u_int32_t vdev_id);
 
 
-#ifdef BIG_ENDIAN_HOST 
+#ifdef BIG_ENDIAN_HOST
      /* This API is used in copying in elements to WMI message,
         since WMI message uses multilpes of 4 bytes, This API
         converts length into multiples of 4 bytes, and performs copy
@@ -337,13 +337,13 @@ wmi_unified_node_set_param(wmi_unified_t wmi_handle, u_int8_t *peer_addr,u_int32
       for(j=0; j < roundup(len, sizeof(u_int32_t))/4; j++) { \
           *(dest+j) = adf_os_le32_to_cpu(*(src+j)); \
       } \
-   } while(0) 
+   } while(0)
 
-#else 
+#else
 
 #define OL_IF_MSG_COPY_CHAR_ARRAY(destp, srcp, len)  do { \
     OS_MEMCPY(destp, srcp, len); \
-   } while(0) 
+   } while(0)
 
 #endif
 
diff --git a/CORE/SERVICES/COMMON/ol_params.h b/CORE/SERVICES/COMMON/ol_params.h
index 0b3d37907229..452cc0839be8 100644
--- a/CORE/SERVICES/COMMON/ol_params.h
+++ b/CORE/SERVICES/COMMON/ol_params.h
@@ -34,7 +34,7 @@
 #include "ol_txrx_stats.h"
 #include "wlan_defs.h" /* for wlan statst definitions */
 /*
-** Enumeration of PDEV Configuration parameter 
+** Enumeration of PDEV Configuration parameter
 */
 
 typedef enum _ol_ath_param_t {
@@ -85,7 +85,7 @@ typedef enum _ol_ath_param_t {
 } ol_ath_param_t;
 
 /*
-** Enumeration of PDEV Configuration parameter 
+** Enumeration of PDEV Configuration parameter
 */
 
 typedef enum _ol_hal_param_t {
@@ -94,7 +94,7 @@ typedef enum _ol_hal_param_t {
 
 
 /*
-** structure to hold all stats information 
+** structure to hold all stats information
 ** for offload device interface
 */
 struct ol_stats {
diff --git a/CORE/SERVICES/COMMON/ol_txrx_ctrl_api.h b/CORE/SERVICES/COMMON/ol_txrx_ctrl_api.h
index 47496a68a22b..ec0e2359debe 100644
--- a/CORE/SERVICES/COMMON/ol_txrx_ctrl_api.h
+++ b/CORE/SERVICES/COMMON/ol_txrx_ctrl_api.h
@@ -149,7 +149,7 @@ ol_txrx_peer_attach(
 /**
 * @brief Parameter type to be input to ol_txrx_peer_update
 * @details
-*  This struct is union,to be used to specify various informations to update 
+*  This struct is union,to be used to specify various informations to update
 *   txrx peer object.
 */
 typedef union  {
@@ -331,7 +331,7 @@ ol_txrx_vdev_unpause(ol_txrx_vdev_handle data_vdev);
  *  suspend all WLAN traffic, e.g. to allow another device such as bluetooth
  *  to temporarily have exclusive access to shared RF chain resources.
  *  This function suspends tx traffic within the specified physical device.
- * 
+ *
  * @param data_pdev - the physical device being paused
  */
 #if defined(CONFIG_HL_SUPPORT)
@@ -520,8 +520,8 @@ ol_txrx_mgmt_tx_cb_set(
  * @param vdev - virtual device transmitting the frame
  * @param tx_mgmt_frm - management frame to transmit
  * @param type - the type of managment frame (determines what callback to use)
- * @param use_6mbps - specify whether management frame to transmit should use 6 Mbps 
- *                    rather than 1 Mbps min rate(for 5GHz band or P2P) 
+ * @param use_6mbps - specify whether management frame to transmit should use 6 Mbps
+ *                    rather than 1 Mbps min rate(for 5GHz band or P2P)
  * @return
  *      0 -> the frame is accepted for transmission, -OR-
  *      1 -> the frame was not accepted
@@ -545,7 +545,7 @@ ol_txrx_mgmt_send(
  *  object that only receives monitor mode packets OR a point to a a vdev
  *  object that also receives non-monitor traffic. In the second case the
  *  OS stack is responsible for delivering the two streams using approprate
- *  OS APIs 
+ *  OS APIs
  *
  * @param pdev - the data physical device object
  * @param vdev - the data virtual device object to deliver monitor mode
@@ -560,10 +560,10 @@ ol_txrx_set_monitor_mode_vap(
     ol_txrx_vdev_handle vdev);
 
 /**
- * @brief Setup the current operating channel of the device 
+ * @brief Setup the current operating channel of the device
  * @details
  *  Mainly used when populating monitor mode status that requires the
- *  current operating channel 
+ *  current operating channel
  *
  * @param pdev - the data physical device object
  * @param chan_mhz - the channel frequency (mhz)
@@ -603,8 +603,8 @@ ol_txrx_discard_tx_pending(
 /**
  * @brief set the safemode of the device
  * @details
- *  This flag is used to bypass the encrypt and decrypt processes when send and 
- *  receive packets. It works like open AUTH mode, HW will treate all packets 
+ *  This flag is used to bypass the encrypt and decrypt processes when send and
+ *  receive packets. It works like open AUTH mode, HW will treate all packets
  *  as non-encrypt frames because no key installed. For rx fragmented frames,
  *  it bypasses all the rx defragmentaion.
  *
@@ -612,7 +612,7 @@ ol_txrx_discard_tx_pending(
  * @param val - the safemode state
  * @return - void
  */
-void 
+void
 ol_txrx_set_safemode(
     ol_txrx_vdev_handle vdev,
     u_int32_t val);
@@ -630,7 +630,7 @@ ol_txrx_set_safemode(
  */
 void
 ol_txrx_set_privacy_filters(
-    ol_txrx_vdev_handle vdev, 
+    ol_txrx_vdev_handle vdev,
 	void *filter,
     u_int32_t num);
 
@@ -639,7 +639,7 @@ ol_txrx_set_privacy_filters(
  * @details
  *  Rx related. When set this flag, all the unencrypted frames
  *  received over a secure connection will be discarded
- * 
+ *
  * @param vdev - the data virtual device object
  * @param val - flag
  * @return - void
diff --git a/CORE/SERVICES/COMMON/ol_txrx_dbg.h b/CORE/SERVICES/COMMON/ol_txrx_dbg.h
index 8231ec0d07e2..41c2eb346c8b 100644
--- a/CORE/SERVICES/COMMON/ol_txrx_dbg.h
+++ b/CORE/SERVICES/COMMON/ol_txrx_dbg.h
@@ -104,8 +104,8 @@ int ol_txrx_fw_stats_get(
     struct ol_txrx_stats_req *req);
 
 
-int ol_txrx_aggr_cfg(ol_txrx_vdev_handle vdev, 
-                     int max_subfrms_ampdu, 
+int ol_txrx_aggr_cfg(ol_txrx_vdev_handle vdev,
+                     int max_subfrms_ampdu,
                      int max_subfrms_amsdu);
 
 enum {
diff --git a/CORE/SERVICES/COMMON/ol_txrx_htt_api.h b/CORE/SERVICES/COMMON/ol_txrx_htt_api.h
index ea95431ba866..b10470e7b1d0 100644
--- a/CORE/SERVICES/COMMON/ol_txrx_htt_api.h
+++ b/CORE/SERVICES/COMMON/ol_txrx_htt_api.h
@@ -544,7 +544,7 @@ ol_rx_pn_ind_handler(
  * @param stats_info_list - stats confirmation message contents, containing
  *      a list of the stats requested from the target
  */
-void 
+void
 ol_txrx_fw_stats_handler(
     ol_txrx_pdev_handle pdev,
     u_int64_t cookie,
@@ -552,8 +552,8 @@ ol_txrx_fw_stats_handler(
 
 /**
  * @brief Process a tx inspect message sent by the target.
- * @details: 
- *  TODO: update 
+ * @details:
+ *  TODO: update
  *  This tx inspect message indicates via the descriptor ID
  *  which tx frames are to be inspected by host. The host
  *  re-injects the packet back to the host for a number of
diff --git a/CORE/SERVICES/COMMON/ol_vowext_dbg_defs.h b/CORE/SERVICES/COMMON/ol_vowext_dbg_defs.h
index 996a553e138d..3c8c8039a1cb 100644
--- a/CORE/SERVICES/COMMON/ol_vowext_dbg_defs.h
+++ b/CORE/SERVICES/COMMON/ol_vowext_dbg_defs.h
@@ -33,7 +33,7 @@
 #define RTP_HDR_OFFSET  42    /* RTP header offset in network buffer */
 #define EXT_HDR_OFFSET 54     /* Extension header offset in network buffer */
 #define UDP_PDU_RTP_EXT  0x90   /* ((2 << 6) | (1 << 4)) RTP Version 2 + X bit */
-#define IP_VER4_N_NO_EXTRA_HEADERS 0x45 
+#define IP_VER4_N_NO_EXTRA_HEADERS 0x45
 #define IPERF3_DATA_OFFSET 12  /* iperf3 data offset from EXT_HDR_OFFSET */
 #define HAL_RX_40  0x08 /* 40 Mhz */
 #define HAL_RX_GI  0x04    /* full gi */
@@ -59,7 +59,7 @@ struct vow_extstats {
 
 /**
  * @brief populates vow ext stats in given network buffer.
- * @param msdu - network buffer handle 
+ * @param msdu - network buffer handle
  * @param pdev - handle to htt dev.
  */
 void ol_ath_add_vow_extstats(htt_pdev_handle pdev, adf_nbuf_t msdu);
diff --git a/CORE/SERVICES/COMMON/osapi_linux.h b/CORE/SERVICES/COMMON/osapi_linux.h
index 8b5c40edfb1a..ff93fc0732c6 100644
--- a/CORE/SERVICES/COMMON/osapi_linux.h
+++ b/CORE/SERVICES/COMMON/osapi_linux.h
@@ -136,7 +136,7 @@ void a_meminfo_report(int clear);
 extern unsigned int enablelogcat;
 extern int android_logger_lv(void* module, int mask);
 enum logidx { LOG_MAIN_IDX = 0 };
-extern int logger_write(const enum logidx idx, 
+extern int logger_write(const enum logidx idx,
                 const unsigned char prio,
                 const char __kernel * const tag,
                 const char __kernel * const fmt,
@@ -151,7 +151,7 @@ extern int logger_write(const enum logidx idx,
 #define A_LOGGER_MODULE_NAME(x) #x
 #define A_LOGGER(mask, mod, args...) \
     A_ANDROID_PRINTF(mask, &GET_ATH_MODULE_DEBUG_VAR_NAME(mod), "ar6k_" A_LOGGER_MODULE_NAME(mod), args);
-#endif 
+#endif
 #define A_PRINTF(args...) A_ANDROID_PRINTF(ATH_DEBUG_INFO, NULL, "ar6k_driver", args)
 #else
 #define A_LOGGER(mask, mod, args...)    printk(args)
@@ -214,7 +214,7 @@ typedef struct timer_list               A_TIMER;
 } while (0)
 
 /*
- * Cancel the Timer. 
+ * Cancel the Timer.
  */
 #define A_UNTIMEOUT(pTimer) do {                                \
     del_timer((pTimer));                                        \
@@ -295,7 +295,7 @@ void android_release_firmware(const struct firmware *firmware);
 #else
 #define A_REQUEST_FIRMWARE(_ppf, _pfile, _dev) request_firmware(_ppf, _pfile, _dev)
 #define A_RELEASE_FIRMWARE(_pf) release_firmware(_pf)
-#endif 
+#endif
 
 /*
  * Initialization of the network buffer subsystem
@@ -330,15 +330,15 @@ typedef struct sk_buff_head A_NETBUF_QUEUE_T;
 #define A_NETBUF_ALLOC_RAW(size) \
     a_netbuf_alloc_raw(size, __func__, __LINE__)
 #define A_NETBUF_MANAGE(bufPtr) \
-    a_netbuf_manage(bufPtr, __func__, __LINE__)  
+    a_netbuf_manage(bufPtr, __func__, __LINE__)
 #define A_NETBUF_UNMANAGE(bufPtr) \
-    a_netbuf_unmanage(bufPtr)      
+    a_netbuf_unmanage(bufPtr)
 #else
 #define A_NETBUF_ALLOC(size) \
     a_netbuf_alloc(size)
 #define A_NETBUF_ALLOC_RAW(size) \
     a_netbuf_alloc_raw(size)
-#define A_NETBUF_MANAGE(bufPtr)    
+#define A_NETBUF_MANAGE(bufPtr)
 #define A_NETBUF_UNMANAGE(bufPtr)
 #endif /* AR6K_ALLOC_DEBUG */
 #define A_NETBUF_FREE(bufPtr) \
@@ -360,19 +360,19 @@ typedef struct sk_buff_head A_NETBUF_QUEUE_T;
 
 /* Add data to end of a buffer  */
 #define A_NETBUF_PUT_DATA(bufPtr, srcPtr,  len) \
-    a_netbuf_put_data(bufPtr, srcPtr, len) 
+    a_netbuf_put_data(bufPtr, srcPtr, len)
 
 /* Add data to start of the  buffer */
 #define A_NETBUF_PUSH_DATA(bufPtr, srcPtr,  len) \
-    a_netbuf_push_data(bufPtr, srcPtr, len) 
+    a_netbuf_push_data(bufPtr, srcPtr, len)
 
 /* Remove data at start of the buffer */
 #define A_NETBUF_PULL_DATA(bufPtr, dstPtr, len) \
-    a_netbuf_pull_data(bufPtr, dstPtr, len) 
+    a_netbuf_pull_data(bufPtr, dstPtr, len)
 
 /* Remove data from the end of the buffer */
 #define A_NETBUF_TRIM_DATA(bufPtr, dstPtr, len) \
-    a_netbuf_trim_data(bufPtr, dstPtr, len) 
+    a_netbuf_trim_data(bufPtr, dstPtr, len)
 
 /* View data as "size" contiguous bytes of type "t" */
 #define A_NETBUF_VIEW_DATA(bufPtr, t, size) \
@@ -381,7 +381,7 @@ typedef struct sk_buff_head A_NETBUF_QUEUE_T;
 /* return the beginning of the headroom for the buffer */
 #define A_NETBUF_HEAD(bufPtr) \
         ((((struct sk_buff *)(bufPtr))->head))
-    
+
 /*
  * OS specific network buffer access routines
  */
@@ -423,16 +423,16 @@ A_UINT32 a_copy_from_user(void *to, const void *from, A_UINT32 n);
 
 /* In linux, WLAN Rx and Tx run in different contexts, so no need to check
  * for any commands/data queued for WLAN */
-#define A_CHECK_DRV_TX()   
-             
+#define A_CHECK_DRV_TX()
+
 #define A_GET_CACHE_LINE_BYTES()    L1_CACHE_BYTES
 
 #define A_CACHE_LINE_PAD            128
 
-static inline void *A_ALIGN_TO_CACHE_LINE(void *ptr) {   
+static inline void *A_ALIGN_TO_CACHE_LINE(void *ptr) {
     return (void *)L1_CACHE_ALIGN((unsigned long)ptr);
 }
-   
+
 #ifdef QCA_PARTNER_PLATFORM
 
 #include "ath_carr_pltfrm.h"
diff --git a/CORE/SERVICES/COMMON/osdep_adf.h b/CORE/SERVICES/COMMON/osdep_adf.h
index 9450de5b8ffc..ad8a949a48c2 100644
--- a/CORE/SERVICES/COMMON/osdep_adf.h
+++ b/CORE/SERVICES/COMMON/osdep_adf.h
@@ -66,7 +66,7 @@
 #include <ar9100.h>
 #endif /* AR9100 */
 
-#define INLINE    __adf_os_inline 
+#define INLINE    __adf_os_inline
 
 /* UNREFERENCED_PARAMETER - provide a dummy reference */
 #define UNREFERENCED_PARAMETER(an) ((void) (an))
@@ -103,7 +103,7 @@
 #ifdef ANDROID
 static inline void spin_lock_dpc(spinlock_t *lock)
 {
-    adf_os_spin_lock_bh((adf_os_spinlock_t *)lock);                                                                            
+    adf_os_spin_lock_bh((adf_os_spinlock_t *)lock);
 }
 static inline void spin_unlock_dpc(spinlock_t *lock)
 {
@@ -111,7 +111,7 @@ static inline void spin_unlock_dpc(spinlock_t *lock)
 }
 #else
 #define spin_lock_dpc(a)    adf_os_spin_lock_bh(a)
-#define spin_unlock_dpc(a)  adf_os_spin_unlock_bh(a) 
+#define spin_unlock_dpc(a)  adf_os_spin_unlock_bh(a)
 #endif
 
 #define spin_lock_destroy(a)
@@ -123,7 +123,7 @@ static inline void spin_unlock_dpc(spinlock_t *lock)
 ** Need to define byte order based on the CPU configuration.
 */
 #ifndef _LITTLE_ENDIAN
-#define _LITTLE_ENDIAN  1234    
+#define _LITTLE_ENDIAN  1234
 #endif
 #ifndef _BIG_ENDIAN
 #define _BIG_ENDIAN 4321
@@ -132,7 +132,7 @@ static inline void spin_unlock_dpc(spinlock_t *lock)
     #define _BYTE_ORDER    _BIG_ENDIAN
 #else
     #define _BYTE_ORDER    _LITTLE_ENDIAN
-#endif 
+#endif
 
 /*
  * Work Queue related macros
@@ -150,8 +150,8 @@ static inline void spin_unlock_dpc(spinlock_t *lock)
  * Deduce if tasklets are available.  If not then
  * fall back to using the immediate work queue.
  */
-#define tq_struct adf_os_bh_t 
-#define ATH_INIT_TQUEUE(a,b,c)      adf_os_create_bh(0, a, b, c) 
+#define tq_struct adf_os_bh_t
+#define ATH_INIT_TQUEUE(a,b,c)      adf_os_create_bh(0, a, b, c)
 #define ATH_SCHEDULE_TQUEUE(a,b)    adf_os_sched_bh(0, a)
 typedef unsigned long TQUEUE_ARG;
 #define mark_bh(a)
@@ -270,7 +270,7 @@ typedef unsigned int rwlock_state_t __attribute__((unused));
 #define OS_NETDEV_UPDATE_TRANS(__sc)\
 {\
     ((__sc)->sc_osdev->netdev)->trans_start = jiffies;\
-}   
+}
 
 /*
  * Locking interface for node
@@ -283,7 +283,7 @@ typedef rwlock_t usb_readwrite_lock_t;
 #define OS_RWLOCK_DESTROY(_nt)
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
-#ifdef CONFIG_SMP 
+#ifdef CONFIG_SMP
 /* Undo the one provided by the kernel to debug spin locks */
 #undef spin_lock
 #undef spin_trylock
@@ -307,7 +307,7 @@ typedef rwlock_t usb_readwrite_lock_t;
       } \
       _spin_unlock_bh(x);\
     } while (0)
-    
+
 #define spin_lock_irqsave(x, f) \
     do { \
       f = _spin_lock_irqsave(x);\
@@ -327,7 +327,7 @@ typedef rwlock_t usb_readwrite_lock_t;
 
 #endif // ifdef CONFIG_SMP
 #else  // if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,37)
-#ifdef CONFIG_SMP 
+#ifdef CONFIG_SMP
 /* Undo the one provided by the kernel to debug spin locks */
 #undef spin_lock
 #undef spin_unlock
@@ -411,18 +411,18 @@ spin_unlock_bh(x);\
 
 #define OS_RWLOCK_WRITE_LOCK_IRQSAVE(rwl, lock_state, flags) do { \
    write_lock_irqsave(rwl, flags); \
-} while (0) 
+} while (0)
 
 #define OS_RWLOCK_READ_UNLOCK_IRQRESTORE(rwl, lock_state, flags) do { \
    read_unlock_irqrestore(rwl, flags); \
-} while (0) 
+} while (0)
 
 #define OS_RWLOCK_WRITE_UNLOCK_IRQRESTORE(rwl, lock_state, flags) do { \
    write_unlock_irqrestore(rwl, flags); \
-} while (0) 
+} while (0)
 
 
-#ifndef OS_SUPPORT_ASYNC_Q 
+#ifndef OS_SUPPORT_ASYNC_Q
 #define OS_SUPPORT_ASYNC_Q 0
 #endif
 
@@ -500,9 +500,9 @@ typedef void (*timer_func)(void *);
 
 typedef struct _os_mesg_t {
     STAILQ_ENTRY(_os_mesg_t)  mesg_next;
-    u_int16_t                 mesg_type;                          
-    u_int16_t                 mesg_len;                          
-    /* followed by mesg_len bytes */ 
+    u_int16_t                 mesg_type;
+    u_int16_t                 mesg_len;
+    /* followed by mesg_len bytes */
 } os_mesg_t;
 
 #define OS_ASYNC_Q_MAX_MESGS 4
@@ -523,14 +523,14 @@ typedef struct {
 } os_task_t;
 
 typedef struct _os_schedule_routing_mesg {
-   os_tasklet_routine_t routine; 
+   os_tasklet_routine_t routine;
    void* context;
 } os_schedule_routing_mesg ;
 
 typedef union _os_async_q_mesg {
    os_schedule_routing_mesg s_mesg;
 } os_async_q_mesg;
-        
+
 
 typedef void (*os_mesg_handler_t)(
     void                *ctx,
@@ -549,11 +549,11 @@ typedef struct {
     spinlock_t                  lock;
     spinlock_t                  ev_handler_lock;
 #ifdef USE_SOFTINTR
-    void                        *_task; 
+    void                        *_task;
 #else
     os_timer_t                  _timer;
 #endif
-    os_mesg_handler_t           handler; 
+    os_mesg_handler_t           handler;
     void                        *ctx;
     u_int8_t                    is_synchronous:1;
 } os_mesg_queue_t;
@@ -587,7 +587,7 @@ struct _NIC_DEV {
     wait_queue_head_t   event_queue;
 #endif /* PERF_PWR_OFFLOAD */
 #if OS_SUPPORT_ASYNC_Q
-    os_mesg_queue_t     async_q;  /* mesgq to handle async calls */ 
+    os_mesg_queue_t     async_q;  /* mesgq to handle async calls */
 #endif
 #ifdef ATH_BUS_PM
     u_int8_t		    isDeviceAsleep;
@@ -703,8 +703,8 @@ typedef dma_addr_t * dma_context_t;
 
 #define OS_FREE_TIMER(_timer)          adf_os_timer_cancel(_timer)
 
-static INLINE void 
-OS_GET_RANDOM_BYTES(void *p, u_int16_t n) 
+static INLINE void
+OS_GET_RANDOM_BYTES(void *p, u_int16_t n)
 {
     get_random_bytes(p, n);
 }
@@ -718,7 +718,7 @@ typedef enum _mesgq_priority_t {
 typedef enum _mesgq_event_delivery_type {
     MESGQ_ASYNCHRONOUS_EVENT_DELIVERY,
     MESGQ_SYNCHRONOUS_EVENT_DELIVERY,
-} mesgq_event_delivery_type; 
+} mesgq_event_delivery_type;
 
 
 
@@ -730,14 +730,14 @@ typedef enum _mesgq_event_delivery_type {
  * module boundaries.
  */
 
-static INLINE void 
+static INLINE void
 os_mesgq_handler(void *timer_arg)
 {
     os_mesg_queue_t    *queue = (os_mesg_queue_t*)timer_arg;
     os_mesg_t          *mesg = NULL;
     void               *msg;
 
-    /* 
+    /*
      * Request access to message queue to retrieve message for processing
      */
     spin_lock(&(queue->lock));
@@ -762,16 +762,16 @@ os_mesgq_handler(void *timer_arg)
         queue->handler(queue->ctx,mesg->mesg_type,mesg->mesg_len, msg);
         spin_unlock(&(queue->ev_handler_lock));
 
-        /* 
+        /*
          * Request access to message queue to retrieve next message
          */
         spin_lock(&(queue->lock));
         queue->num_queued--;
         STAILQ_INSERT_TAIL(&queue->mesg_free_head,mesg, mesg_next);
         mesg = STAILQ_FIRST(&queue->mesg_head);
-    } 
+    }
 
-    /* 
+    /*
      * Release message queue
      */
     spin_unlock(&(queue->lock));
@@ -782,22 +782,22 @@ os_mesgq_handler(void *timer_arg)
  * devhandle   : os dev handle.
  * queue       : message queue.
  * mesg_len    : maximum length of message.
- * max_queued  : maximum number of messages that can be queued at any time. 
+ * max_queued  : maximum number of messages that can be queued at any time.
  * msg_handler : handler function which will be called
  *                asynchronously to deliver each message.
- */   
-static INLINE int OS_MESGQ_INIT(osdev_t devhandle, os_mesg_queue_t *queue, 
+ */
+static INLINE int OS_MESGQ_INIT(osdev_t devhandle, os_mesg_queue_t *queue,
                                 u_int32_t mesg_len, u_int32_t max_queued,
                                 os_mesg_handler_t msg_handler, void *context,
-                                mesgq_priority_t priority, 
-                                mesgq_event_delivery_type mq_type) 
+                                mesgq_priority_t priority,
+                                mesgq_event_delivery_type mq_type)
 {
     int i,len;
     os_mesg_t *mesg;
 
     len = (mesg_len + sizeof(struct _os_mesg_t));
     queue->mesg_queue_buf = adf_os_mem_alloc(NULL, (adf_os_size_t) len*max_queued);
-    if (!queue->mesg_queue_buf) 
+    if (!queue->mesg_queue_buf)
         return -ENOMEM;
     queue->dev_handle = devhandle;
     STAILQ_INIT(&queue->mesg_head);
@@ -832,9 +832,9 @@ static INLINE int OS_MESGQ_INIT(osdev_t devhandle, os_mesg_queue_t *queue,
  * queue : message queue.
  * msg   : message (opaque) . the size of the message
  *         is equal to the mesg_length passed to the OS_MESG_INIT
- *     
+ *
  */
-static INLINE int OS_MESGQ_SEND(os_mesg_queue_t *queue,u_int16_t type, u_int16_t len,  void *msg) 
+static INLINE int OS_MESGQ_SEND(os_mesg_queue_t *queue,u_int16_t type, u_int16_t len,  void *msg)
 {
     os_mesg_t *mesg;
 
@@ -875,7 +875,7 @@ static INLINE int OS_MESGQ_SEND(os_mesg_queue_t *queue,u_int16_t type, u_int16_t
  * this is only for single threaded operating systems.
  * assert for now.
  */
-static INLINE int OS_MESGQ_SEND_SYNC(os_mesg_queue_t *queue,u_int16_t type, u_int16_t len,  void *msg, bool flush) 
+static INLINE int OS_MESGQ_SEND_SYNC(os_mesg_queue_t *queue,u_int16_t type, u_int16_t len,  void *msg, bool flush)
 {
     KASSERT(0,(" mesg queue sync send is not supported by linux"));
     return 0;
@@ -903,7 +903,7 @@ static INLINE void OS_MESGQ_DRAIN(os_mesg_queue_t *queue, os_mesg_handler_t msg_
     while(mesg) {
         STAILQ_REMOVE_HEAD(&queue->mesg_head, mesg_next);
         queue->num_queued--;
-        if (msg_handler != NULL) {            
+        if (msg_handler != NULL) {
             if (mesg->mesg_len) {
                 msg = (void *) (mesg+1);
             } else {
@@ -916,7 +916,7 @@ static INLINE void OS_MESGQ_DRAIN(os_mesg_queue_t *queue, os_mesg_handler_t msg_
     };
     STAILQ_INIT(&queue->mesg_head);
     spin_unlock(&(queue->lock));
-} 
+}
 
 
 /*
@@ -952,14 +952,14 @@ static INLINE void OS_MESGQ_DESTROY(os_mesg_queue_t *queue)
  */
 static INLINE int
 OS_SCHEDULE_ROUTING(osdev_t pNicDev,
-                     os_tasklet_routine_t routine, 
+                     os_tasklet_routine_t routine,
                      void* context)
 {
 #if OS_SUPPORT_ASYNC_Q
    os_schedule_routing_mesg  s_mesg ;
-   s_mesg.routine = routine; 
+   s_mesg.routine = routine;
    s_mesg.context = context;
-   OS_MESGQ_SEND(&pNicDev->async_q,OS_SCHEDULE_ROUTING_MESG_TYPE, sizeof(os_schedule_routing_mesg), &s_mesg); 
+   OS_MESGQ_SEND(&pNicDev->async_q,OS_SCHEDULE_ROUTING_MESG_TYPE, sizeof(os_schedule_routing_mesg), &s_mesg);
 
 #else
     routine(context, NULL);
@@ -1011,7 +1011,7 @@ static INLINE u_int32_t
 OS_PCI_READ_CONFIG(osdev_t osdev, u_int32_t offset, void *p, u_int32_t bytes)
 {
     struct pci_dev *pdev = (struct pci_dev *)osdev->bdev;
-    
+
     switch (bytes) {
     case 1:
         pci_read_config_byte(pdev, offset, p);
@@ -1030,7 +1030,7 @@ static INLINE void
 OS_PCI_WRITE_CONFIG(osdev_t osdev, u_int32_t offset, void *p, u_int32_t bytes)
 {
     struct pci_dev *pdev = (struct pci_dev *)osdev->bdev;
-    
+
     switch (bytes) {
     case 1:
         pci_write_config_byte(pdev, offset, *(u_int8_t *)p);
diff --git a/CORE/SERVICES/COMMON/pktlog_ac_fmt.h b/CORE/SERVICES/COMMON/pktlog_ac_fmt.h
index 0ba17e14938d..9f7551c1cb1a 100644
--- a/CORE/SERVICES/COMMON/pktlog_ac_fmt.h
+++ b/CORE/SERVICES/COMMON/pktlog_ac_fmt.h
@@ -100,9 +100,9 @@ enum {
 #define PHFLAGS_PROTO_SFT       12
 #define PHFLAGS_MACVERSION_MASK 0x0fff0000
 #define PHFLAGS_MACVERSION_SFT  16
-/* 
- * XXX: This need not be part of packetlog header flags - Should be 
- * moved to plinfo 
+/*
+ * XXX: This need not be part of packetlog header flags - Should be
+ * moved to plinfo
  */
 
 #define PHFLAGS_INTERRUPT_CONTEXT 0x80000000
@@ -159,7 +159,7 @@ enum {
 #define PKTLOG_TYPE_TEXT     6*/
 
 #define PKTLOG_MAX_TXCTL_WORDS 57 /* +2 words for bitmap */
-#define PKTLOG_MAX_TXSTATUS_WORDS 32 
+#define PKTLOG_MAX_TXSTATUS_WORDS 32
 #define PKTLOG_MAX_PROTO_WORDS  16
 #define PKTLOG_MAX_RXDESC_WORDS 62
 
@@ -185,9 +185,9 @@ typedef struct {
      *  Reduces computation in the driver code
      */
     A_UINT16 id[MAX_PKT_INFO_MSDU_ID];
-}__ATTRIB_PACK msdu_id_info_t; 
+}__ATTRIB_PACK msdu_id_info_t;
 #define MSDU_ID_INFO_NUM_MSDU_OFFSET 0 /* char offset */
-#define MSDU_ID_INFO_BOUND_BM_OFFSET 4 
+#define MSDU_ID_INFO_BOUND_BM_OFFSET 4
 #define MSDU_ID_INFO_ID_OFFSET  \
     ((MAX_PKT_INFO_MSDU_ID >> 3) + 4)
 
@@ -221,12 +221,12 @@ struct ath_pktlog_msdu_info {
             A_UINT32 num_msdu;
             A_UINT8 bound_bmap[MAX_PKT_INFO_MSDU_ID>>3];
         } msdu_id_info;
-        /* 
+        /*
          * array of num_msdu
          * Static implementation will consume unwanted memory
          * Need to split the pktlog_get_buf to get the buffer pointer only
          */
-        uint16_t msdu_len[MAX_PKT_INFO_MSDU_ID]; 
+        uint16_t msdu_len[MAX_PKT_INFO_MSDU_ID];
     } priv;
     size_t priv_size;
 
@@ -310,8 +310,8 @@ struct ath_pktlog_rcupdate {
     u_int8_t aggrLimit;/* rate control and aggregation variables ( part of ATH_SUPPORT_VOWEXT ) */
     u_int8_t lastRate; /* rate control and aggregation variables ( part of ATH_SUPPORT_VOWEXT ) */
     int32_t misc[0];         /* Can be used for HT specific or other misc info */
-    /* TBD: Add any new parameters required */ 
-} __ATTRIB_PACK; 
+    /* TBD: Add any new parameters required */
+} __ATTRIB_PACK;
 
 #ifdef WIN32
 #pragma pack(pop, pktlog_fmt)
diff --git a/CORE/SERVICES/COMMON/queue.h b/CORE/SERVICES/COMMON/queue.h
index ba275d38eac2..2d46e3220ecf 100644
--- a/CORE/SERVICES/COMMON/queue.h
+++ b/CORE/SERVICES/COMMON/queue.h
@@ -589,4 +589,3 @@ void    remque(void *a);
 #endif /* _KERNEL */
 
 #endif /* !_SYS_QUEUE_H_ */
-
diff --git a/CORE/SERVICES/COMMON/sys/queue.h b/CORE/SERVICES/COMMON/sys/queue.h
index 020ab386b4f2..4fff31dfb5e9 100644
--- a/CORE/SERVICES/COMMON/sys/queue.h
+++ b/CORE/SERVICES/COMMON/sys/queue.h
@@ -424,7 +424,7 @@ struct {                                \
 /*
  * Tail queue declarations.
  */
-#define  HEADNAME    
+#define  HEADNAME
 #define  COPY_HEADNAME(head)
 
 #define    TAILQ_HEAD(name, type)                        \
diff --git a/CORE/SERVICES/COMMON/targaddrs.h b/CORE/SERVICES/COMMON/targaddrs.h
index 5ad7f6f56af6..4c035562f5f8 100644
--- a/CORE/SERVICES/COMMON/targaddrs.h
+++ b/CORE/SERVICES/COMMON/targaddrs.h
@@ -356,7 +356,7 @@ PREPACK64 struct host_interest_s {
 #define HI_OPTION_DISABLE_CDC_MAX_PERF_WAR  0x20
 #define CDC_MAX_PERF_WAR_ENABLED()    \
         (!(HOST_INTEREST->hi_option_flag2 & HI_OPTION_DISABLE_CDC_MAX_PERF_WAR))
-            
+
 /* hi_reset_flag */
 #define HI_RESET_FLAG_PRESERVE_APP_START         0x01  /* preserve App Start address */
 #define HI_RESET_FLAG_PRESERVE_HOST_INTEREST     0x02  /* preserve host interest */
@@ -493,15 +493,15 @@ PREPACK64 struct host_interest_s {
  * [0:3]      number of bank assigned to be IRAM
  * [4:15]     reserved
  * [16:31]    magic number
- * 
+ *
  * Note:
  * 1. target firmware would check magic number and if it's a match, firmware
  *    would consider the bits[0:15] are valid and base on that to calculate
  *    the end of DRAM. Early allocation would be located at that area and
  *    may be reclaimed when necesary
  * 2. if no magic number is found, early allocation would happen at "_end"
- *    symbol of ROM which is located before the app-data and might NOT be 
- *    re-claimable. If this is adopted, link script should keep this in 
+ *    symbol of ROM which is located before the app-data and might NOT be
+ *    re-claimable. If this is adopted, link script should keep this in
  *    mind to avoid data corruption.
  */
 #define HI_EARLY_ALLOC_MAGIC                   0x6d8a
diff --git a/CORE/SERVICES/COMMON/wal_rx_desc.h b/CORE/SERVICES/COMMON/wal_rx_desc.h
index e880ed2b7c03..ecdca1181828 100644
--- a/CORE/SERVICES/COMMON/wal_rx_desc.h
+++ b/CORE/SERVICES/COMMON/wal_rx_desc.h
@@ -35,9 +35,9 @@
 #include <a_types.h> /* A_UINT8 */
 #endif
 
-/* 
- * As this header is used by host also, 
- * and host will access target registers by target reg tbl, 
+/*
+ * As this header is used by host also,
+ * and host will access target registers by target reg tbl,
  * so disable direct-reference here for host.
  *
  */
diff --git a/CORE/SERVICES/COMMON/wdi_event.h b/CORE/SERVICES/COMMON/wdi_event.h
index 9a857faaa9fa..70ab930dd4dd 100644
--- a/CORE/SERVICES/COMMON/wdi_event.h
+++ b/CORE/SERVICES/COMMON/wdi_event.h
@@ -30,7 +30,7 @@
 
 #include "athdefs.h"
 #include "adf_nbuf.h"
-#define WDI_EVENT_BASE 0x100 	 /* Event starting number */
+#define WDI_EVENT_BASE 0x100	 /* Event starting number */
 
 enum WDI_EVENT {
 	WDI_EVENT_TX_STATUS = WDI_EVENT_BASE,
diff --git a/CORE/SERVICES/COMMON/wdi_event_api.h b/CORE/SERVICES/COMMON/wdi_event_api.h
index b41b94bfcee8..4ed3a424ea8a 100644
--- a/CORE/SERVICES/COMMON/wdi_event_api.h
+++ b/CORE/SERVICES/COMMON/wdi_event_api.h
@@ -49,7 +49,7 @@ struct ol_txrx_pdev_t;
  */
 A_STATUS wdi_event_sub(
     struct ol_txrx_pdev_t *txrx_pdev,
-    wdi_event_subscribe *event_cb_sub, 
+    wdi_event_subscribe *event_cb_sub,
     enum WDI_EVENT event);
 
 /**
@@ -67,7 +67,7 @@ A_STATUS wdi_event_sub(
  */
 A_STATUS wdi_event_unsub(
     struct ol_txrx_pdev_t *txrx_pdev,
-    wdi_event_subscribe *event_cb_sub, 
+    wdi_event_subscribe *event_cb_sub,
     enum WDI_EVENT event);
 
 #ifdef WDI_EVENT_ENABLE
diff --git a/CORE/SERVICES/COMMON/wdi_in.h b/CORE/SERVICES/COMMON/wdi_in.h
index 48bc7dd9c408..079236b708f8 100644
--- a/CORE/SERVICES/COMMON/wdi_in.h
+++ b/CORE/SERVICES/COMMON/wdi_in.h
@@ -185,7 +185,7 @@ struct peer_ratectrl_params_t {
 /**
 * @brief Parameter type to be input to wdi_in_peer_update
 * @details
-*  This struct is union,to be used to specify various informations to update 
+*  This struct is union,to be used to specify various informations to update
 *   txrx peer object.
 */
 typedef union  {
@@ -212,8 +212,8 @@ typedef enum {
  * @brief Update the data peer object as some informaiton changed in node.
  * @details
  *  Only a single prarameter can be changed for each call to this func.
- *  For the host-based implementation of rate-control (select  == 
- *  ol_txrx_peer_update_rate_ctrl), it updates the peer/node-related parameters 
+ *  For the host-based implementation of rate-control (select  ==
+ *  ol_txrx_peer_update_rate_ctrl), it updates the peer/node-related parameters
  *  within rate-control context of the peer at association.
  *
  * @param peer - pointer to the node's object
@@ -354,7 +354,7 @@ wdi_in_vdev_unpause(ol_txrx_vdev_handle data_vdev);
  *  suspend all WLAN traffic, e.g. to allow another device such as bluetooth
  *  to temporarily have exclusive access to shared RF chain resources.
  *  This function suspends tx traffic within the specified physical device.
- * 
+ *
  * @param data_pdev - the physical device being paused
  */
 #if defined(CONFIG_HL_SUPPORT)
@@ -541,8 +541,8 @@ wdi_in_mgmt_tx_cb_set(
  * @param vdev - virtual device transmitting the frame
  * @param tx_mgmt_frm - management frame to transmit
  * @param type - the type of managment frame (determines what callback to use)
- * @param use_6mbps - specify whether management frame to transmit should use 6 Mbps 
- *                    rather than 1 Mbps min rate(for 5GHz band or P2P) 
+ * @param use_6mbps - specify whether management frame to transmit should use 6 Mbps
+ *                    rather than 1 Mbps min rate(for 5GHz band or P2P)
  * @return
  *      0 -> the frame is accepted for transmission, -OR-
  *      1 -> the frame was not accepted
@@ -566,7 +566,7 @@ wdi_in_mgmt_send(
  *  object that only receives monitor mode packets OR a point to a a vdev
  *  object that also receives non-monitor traffic. In the second case the
  *  OS stack is responsible for delivering the two streams using approprate
- *  OS APIs 
+ *  OS APIs
  *
  * @param pdev - the data physical device object
  * @param vdev - the data virtual device object to deliver monitor mode
@@ -581,10 +581,10 @@ wdi_in_set_monitor_mode_vap(
     ol_txrx_vdev_handle vdev);
 
 /**
- * @brief Setup the current operating channel of the device 
+ * @brief Setup the current operating channel of the device
  * @details
  *  Mainly used when populating monitor mode status that requires the
- *  current operating channel 
+ *  current operating channel
  *
  * @param pdev - the data physical device object
  * @param chan_mhz - the channel frequency (mhz)
@@ -624,8 +624,8 @@ wdi_in_discard_tx_pending(
 /**
  * @brief set the safemode of the device
  * @details
- *  This flag is used to bypass the encrypt and decrypt processes when send and 
- *  receive packets. It works like open AUTH mode, HW will treate all packets 
+ *  This flag is used to bypass the encrypt and decrypt processes when send and
+ *  receive packets. It works like open AUTH mode, HW will treate all packets
  *  as non-encrypt frames because no key installed. For rx fragmented frames,
  *  it bypasses all the rx defragmentaion.
  *
@@ -633,7 +633,7 @@ wdi_in_discard_tx_pending(
  * @param val - the safemode state
  * @return - void
  */
-void 
+void
 wdi_in_set_safemode(
     ol_txrx_vdev_handle vdev,
     u_int32_t val);
@@ -651,7 +651,7 @@ wdi_in_set_safemode(
  */
 void
 wdi_in_set_privacy_filters(
-    ol_txrx_vdev_handle vdev, 
+    ol_txrx_vdev_handle vdev,
 	void *filter,
     u_int32_t num);
 
@@ -660,7 +660,7 @@ wdi_in_set_privacy_filters(
  * @details
  *  Rx related. When set this flag, all the unencrypted frames
  *  received over a secure connection will be discarded
- * 
+ *
  * @param vdev - the data virtual device object
  * @param val - flag
  * @return - void
@@ -901,7 +901,7 @@ adf_nbuf_t wdi_in_osif_tso_segment(
     int max_seg_payload_bytes,
     adf_nbuf_t jumbo_tcp_frame);
 
-#define WDI_EVENT_BASE 0x100 	 /* Event starting number */
+#define WDI_EVENT_BASE 0x100	 /* Event starting number */
 
 enum WDI_EVENT {
     WDI_EVENT_TX_STATUS = WDI_EVENT_BASE,
@@ -979,7 +979,7 @@ typedef struct wdi_event_pdev_t *wdi_event_pdev_handle;
  */
 A_STATUS wdi_in_event_sub(
     struct ol_txrx_pdev_t *txrx_pdev,
-    wdi_event_subscribe *event_cb_sub, 
+    wdi_event_subscribe *event_cb_sub,
     enum WDI_EVENT event);
 
 /**
@@ -997,7 +997,7 @@ A_STATUS wdi_in_event_sub(
  */
 A_STATUS wdi_in_event_unsub(
     struct ol_txrx_pdev_t *txrx_pdev,
-    wdi_event_subscribe *event_cb_sub, 
+    wdi_event_subscribe *event_cb_sub,
     enum WDI_EVENT event);
 
 #include <adf_os_lock.h>   /* adf_os_mutex_t */
@@ -1063,8 +1063,8 @@ int wdi_in_fw_stats_get(
     ol_txrx_vdev_handle vdev,
     struct ol_txrx_stats_req *req);
 
-int wdi_in_aggr_cfg(ol_txrx_vdev_handle vdev, 
-                     int max_subfrms_ampdu, 
+int wdi_in_aggr_cfg(ol_txrx_vdev_handle vdev,
+                     int max_subfrms_ampdu,
                      int max_subfrms_amsdu);
 
 enum {
diff --git a/CORE/SERVICES/COMMON/wdi_out.h b/CORE/SERVICES/COMMON/wdi_out.h
index b308e7d0f85e..655de88a698e 100644
--- a/CORE/SERVICES/COMMON/wdi_out.h
+++ b/CORE/SERVICES/COMMON/wdi_out.h
@@ -206,7 +206,7 @@ int wdi_out_cfg_netbuf_frags_max(ol_pdev_handle pdev);
  *  transmit frames until the target explicitly indicates it is finished
  *  transmitting them, or if it should free its copy as soon as the
  *  tx frame is downloaded to the target.
- *  
+ *
  * @param pdev - handle to the physical device
  * @return
  *      0 -> retain the tx frame until the target indicates it is done
@@ -217,14 +217,14 @@ int wdi_out_cfg_netbuf_frags_max(ol_pdev_handle pdev);
 int wdi_out_cfg_tx_free_at_download(ol_pdev_handle pdev);
 
 /**
- * @brief Low water mark for target tx credit. 
- * Tx completion handler is invoked to reap the buffers when the target tx 
+ * @brief Low water mark for target tx credit.
+ * Tx completion handler is invoked to reap the buffers when the target tx
  * credit goes below Low Water Mark.
  */
 #define OL_CFG_NUM_MSDU_REAP 512
 #define wdi_out_cfg_tx_credit_lwm(pdev)                                             \
         ((CFG_TGT_NUM_MSDU_DESC >  OL_CFG_NUM_MSDU_REAP) ?                     \
-                        (CFG_TGT_NUM_MSDU_DESC -  OL_CFG_NUM_MSDU_REAP) : 0)   
+                        (CFG_TGT_NUM_MSDU_DESC -  OL_CFG_NUM_MSDU_REAP) : 0)
 
 /**
  * @brief In a HL system, specify the target initial credit count.
@@ -274,12 +274,12 @@ int wdi_out_cfg_tx_download_size(ol_pdev_handle pdev);
  *   logic to time out stale fragments is moved to the host.
  *
  * @param pdev - handle to the physical device
- * @return 
+ * @return
  *  0 -> target is responsible non-aggregate duplicate detection and
- *          timing out stale fragments. 
+ *          timing out stale fragments.
  *
  *  1 -> host is responsible non-aggregate duplicate detection and
- *          timing out stale fragments. 
+ *          timing out stale fragments.
  */
 int wdi_out_cfg_rx_host_defrag_timeout_duplicate_check(ol_pdev_handle pdev);
 
@@ -396,7 +396,7 @@ enum ol_rx_err_type {
 #ifdef SUPPORT_HOST_STATISTICS
 /** * @brief Update tx statistics
  * @details
- *  Update tx statistics after tx complete. 
+ *  Update tx statistics after tx complete.
  *
  * @param pdev - ol_pdev_handle instance
  * @param vdev_id - ID of the virtual device that tx frame
@@ -406,7 +406,7 @@ void wdi_out_tx_statistics(ol_pdev_handle pdev,
                       u_int16_t vdev_id,
 					  int had_error);
 #else
-#define wdi_out_tx_statistics(pdev, vdev_id, had_error) 
+#define wdi_out_tx_statistics(pdev, vdev_id, had_error)
 #endif
 
 /** * @brief Count on received packets for invalid peer case
diff --git a/CORE/SERVICES/COMMON/wlan_defs.h b/CORE/SERVICES/COMMON/wlan_defs.h
index ba9ef6ada3bb..a1c890788b6f 100644
--- a/CORE/SERVICES/COMMON/wlan_defs.h
+++ b/CORE/SERVICES/COMMON/wlan_defs.h
@@ -38,7 +38,7 @@
 
 /*
  * This file contains WLAN definitions that may be used across both
- * Host and Target software.  
+ * Host and Target software.
  */
 
 #define MAX_SPATIAL_STREAM   3
@@ -98,7 +98,7 @@ typedef enum {
                                  ((mode) == MODE_11NA_HT20) || \
                                  ((mode) == MODE_11NA_HT40) || \
                                  (IS_MODE_VHT(mode)))
-                                 
+
 #define IS_MODE_11B(mode)       ((mode) == MODE_11B)
 #define IS_MODE_11G(mode)       (((mode) == MODE_11G) || \
                                  ((mode) == MODE_11GONLY) || \
@@ -157,10 +157,10 @@ enum {
 typedef struct {
     A_UINT32 tlv_header;     /* TLV tag and len; tag equals WMI_TLVTAG_STRUC_HAL_REG_CAPABILITIES */
     A_UINT32 eeprom_rd;      //regdomain value specified in EEPROM
-    A_UINT32 eeprom_rd_ext;  //regdomain 
+    A_UINT32 eeprom_rd_ext;  //regdomain
     A_UINT32 regcap1;        // CAP1 capabilities bit map.
     A_UINT32 regcap2;        // REGDMN EEPROM CAP.
-    A_UINT32 wireless_modes; // REGDMN MODE 
+    A_UINT32 wireless_modes; // REGDMN MODE
     A_UINT32 low_2ghz_chan;
     A_UINT32 high_2ghz_chan;
     A_UINT32 low_5ghz_chan;
@@ -178,7 +178,7 @@ typedef enum {
 
 /*
  * Used to update rate-control logic with the status of the tx-completion.
- * In host-based implementation of the rate-control feature, this struture is used to 
+ * In host-based implementation of the rate-control feature, this struture is used to
  * create the payload for HTT message/s from target to host.
  */
 
@@ -292,9 +292,9 @@ typedef struct{
 typedef struct {
    A_UINT32   tlv_header;     /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wlan_host_memory_chunk */
    /** id of the request that is passed up in service ready */
-   A_UINT32 req_id; 
+   A_UINT32 req_id;
    /** the physical address the memory chunk */
-   A_UINT32 ptr; 
+   A_UINT32 ptr;
    /** size of the chunk */
    A_UINT32 size;
 } wlan_host_memory_chunk;
@@ -303,7 +303,7 @@ typedef struct {
 #define NUM_UNITS_IS_NUM_PEERS   0x2
 
 /**
- * structure used by FW for requesting host memory 
+ * structure used by FW for requesting host memory
  */
 typedef struct {
     A_UINT32    tlv_header;     /* TLV tag and len; tag equals WMI_TLVTAG_STRUC_wlan_host_mem_req */
diff --git a/CORE/SERVICES/COMMON/wlan_opts.h b/CORE/SERVICES/COMMON/wlan_opts.h
index e366b5f659cf..4fed4cdb7d67 100644
--- a/CORE/SERVICES/COMMON/wlan_opts.h
+++ b/CORE/SERVICES/COMMON/wlan_opts.h
@@ -36,7 +36,7 @@
 #define ATH_DEBUG 1 /* default: include debug code */
 #endif
 
-#if ATH_DEBUG  
+#if ATH_DEBUG
 #define DEBUG_VAR_DECL_INIT(_var,_type,_value) _type (_var)=_value
 #else
 #define DEBUG_VAR_DECL_INIT(_var,_type,_value)
diff --git a/CORE/SERVICES/COMMON/wlan_tgt_def_config.h b/CORE/SERVICES/COMMON/wlan_tgt_def_config.h
index ff0f743b3d71..0eeec932ef7f 100644
--- a/CORE/SERVICES/COMMON/wlan_tgt_def_config.h
+++ b/CORE/SERVICES/COMMON/wlan_tgt_def_config.h
@@ -61,7 +61,7 @@
  * probably always be appropriate; it is probably not necessary to
  * determine this value dynamically.
  */
-#define CFG_TGT_AST_SKID_LIMIT          16 
+#define CFG_TGT_AST_SKID_LIMIT          16
 
 /*
  * total number of peers per device.
@@ -103,7 +103,7 @@
  */
 #define CFG_TGT_NUM_PEER_KEYS           3
 /*
- * total number of data TX and RX TIDs 
+ * total number of data TX and RX TIDs
  */
 #define CFG_TGT_NUM_TIDS       (2 * (CFG_TGT_NUM_PEERS + CFG_TGT_NUM_VDEV + 2))
 /*
diff --git a/CORE/SERVICES/COMMON/wlan_tgt_def_config_hl.h b/CORE/SERVICES/COMMON/wlan_tgt_def_config_hl.h
index 27c555290ac7..caffe3b2f505 100644
--- a/CORE/SERVICES/COMMON/wlan_tgt_def_config_hl.h
+++ b/CORE/SERVICES/COMMON/wlan_tgt_def_config_hl.h
@@ -87,7 +87,7 @@
  */
 #define CFG_TGT_NUM_PEER_KEYS           2
 /*
- * total number of TX/RX data TIDs 
+ * total number of TX/RX data TIDs
  */
 #define CFG_TGT_NUM_TIDS                (2 * (CFG_TGT_NUM_PEERS + CFG_TGT_NUM_VDEV))
 /*
diff --git a/CORE/SERVICES/COMMON/wma_api.h b/CORE/SERVICES/COMMON/wma_api.h
index 0055a219dd42..fd2d3f4ca373 100644
--- a/CORE/SERVICES/COMMON/wma_api.h
+++ b/CORE/SERVICES/COMMON/wma_api.h
@@ -103,7 +103,7 @@ VOS_STATUS wma_wmi_service_close(v_VOID_t *vos_context);
 
 v_VOID_t wma_rx_ready_event(WMA_HANDLE handle, v_VOID_t *ev);
 
-v_VOID_t wma_rx_service_ready_event(WMA_HANDLE handle, 
+v_VOID_t wma_rx_service_ready_event(WMA_HANDLE handle,
 				v_VOID_t *ev);
 
 v_VOID_t wma_setneedshutdown(v_VOID_t *vos_context);
diff --git a/CORE/SERVICES/COMMON/wmi.h b/CORE/SERVICES/COMMON/wmi.h
index 29abf5eb0693..f2df8907e9f1 100644
--- a/CORE/SERVICES/COMMON/wmi.h
+++ b/CORE/SERVICES/COMMON/wmi.h
@@ -104,7 +104,7 @@ typedef PREPACK struct {
 #define WMI_CMD_HDR_COMMANDID_MASK          0x00ffffff
 #define WMI_CMD_HDR_COMMANDID_OFFSET        0x00000000
 #define WMI_CMD_HDR_PLT_PRIV_LSB            24
-#define WMI_CMD_HDR_PLT_PRIV_MASK           0xff000000 
+#define WMI_CMD_HDR_PLT_PRIV_MASK           0xff000000
 #define WMI_CMD_HDR_PLT_PRIV_OFFSET         0x00000000
 
 /*
diff --git a/CORE/SERVICES/COMMON/wmi_tlv_defs.h b/CORE/SERVICES/COMMON/wmi_tlv_defs.h
index 5ea671fc5491..aae8b88e3095 100644
--- a/CORE/SERVICES/COMMON/wmi_tlv_defs.h
+++ b/CORE/SERVICES/COMMON/wmi_tlv_defs.h
@@ -1851,4 +1851,3 @@ WMITLV_CREATE_PARAM_STRUC(WMI_DIAG_DATA_CONTAINER_EVENTID);
 #endif
 
 #endif /*_WMI_TLV_DEFS_H_*/
-
diff --git a/CORE/SERVICES/COMMON/wmi_tlv_helper.h b/CORE/SERVICES/COMMON/wmi_tlv_helper.h
index 6efbf5f48c02..8064913f0eb9 100644
--- a/CORE/SERVICES/COMMON/wmi_tlv_helper.h
+++ b/CORE/SERVICES/COMMON/wmi_tlv_helper.h
@@ -154,4 +154,3 @@ int
 wmi_versions_are_compatible(struct _wmi_abi_version *vers1, struct _wmi_abi_version *vers2);
 
 #endif /*_WMI_TLV_HELPER_H_*/
-
diff --git a/CORE/SERVICES/COMMON/wmi_unified.h b/CORE/SERVICES/COMMON/wmi_unified.h
index c5e803378a43..49f9cd6dba2e 100644
--- a/CORE/SERVICES/COMMON/wmi_unified.h
+++ b/CORE/SERVICES/COMMON/wmi_unified.h
@@ -1932,10 +1932,10 @@ typedef struct {
 typedef struct {
     A_UINT32 tlv_header;     /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_set_quiet_cmd_fixed_param */
     A_UINT32 reserved0;      /** placeholder for pdev_id of future multiple MAC products. Init. to 0. */
-	A_UINT32 period;		/*period in TUs*/	
+	A_UINT32 period;		/*period in TUs*/
 	A_UINT32 duration;		/*duration in TUs*/
 	A_UINT32 next_start;	/*offset in TUs*/
-        A_UINT32 enabled; 		/*enable/disable*/
+        A_UINT32 enabled;		/*enable/disable*/
 } wmi_pdev_set_quiet_cmd_fixed_param;
 
 /*
@@ -5253,7 +5253,7 @@ typedef struct {
 
 typedef struct {
     A_UINT32    tlv_header;                     /** TLV tag and len; tag equals WMITLV_TAG_STRUC_WMI_GTK_OFFLOAD_CMD_fixed_param */
-    A_UINT32 	vdev_id;    					/** unique id identifying the VDEV */
+    A_UINT32	vdev_id;					/** unique id identifying the VDEV */
     A_UINT32    flags;                          /* control flags, GTK offload command use high byte  */
     /* The size of following 3 arrays cannot be changed without breaking WMI compatibility. */
     A_UINT8     KEK[GTK_OFFLOAD_KEK_BYTES];     /* key encryption key */
diff --git a/CORE/SERVICES/COMMON/wmi_version.h b/CORE/SERVICES/COMMON/wmi_version.h
index 12899afbe057..fb3e00c77ac1 100644
--- a/CORE/SERVICES/COMMON/wmi_version.h
+++ b/CORE/SERVICES/COMMON/wmi_version.h
@@ -78,4 +78,3 @@
 #define WMI_ABI_VERSION_NS_1 __NAMESPACE_1_
 #define WMI_ABI_VERSION_NS_2 __NAMESPACE_2_
 #define WMI_ABI_VERSION_NS_3 __NAMESPACE_3_
-
diff --git a/CORE/SERVICES/COMMON/wmi_version_whitelist.c b/CORE/SERVICES/COMMON/wmi_version_whitelist.c
index 00fa8e23ea5e..266b7620445f 100644
--- a/CORE/SERVICES/COMMON/wmi_version_whitelist.c
+++ b/CORE/SERVICES/COMMON/wmi_version_whitelist.c
@@ -37,5 +37,3 @@ wmi_whitelist_version_info version_whitelist[] =
 {
     {0, 0, 0x5F414351, 0x00004C4D, 0, 0},    //Placeholder: Major=0, Minor=0, Namespace="QCA_ML" (Dummy entry)
 };
-
-
diff --git a/CORE/SERVICES/WMA/wlan_nv.c b/CORE/SERVICES/WMA/wlan_nv.c
index 83b8573ac1e8..b7ee5b99f8fe 100644
--- a/CORE/SERVICES/WMA/wlan_nv.c
+++ b/CORE/SERVICES/WMA/wlan_nv.c
@@ -96,7 +96,7 @@ const sHalNv nvDefaults =
                 {1550},    // HAL_PHY_RATE_11A_DUP_36_MBPS,
                 {1550},    // HAL_PHY_RATE_11A_DUP_48_MBPS,
                 {1500},    // HAL_PHY_RATE_11A_DUP_54_MBPS,
-                
+
                 //MCS Index #0-7(20/40MHz)
                 {1700},    // HAL_PHY_RATE_MCS_1NSS_6_5_MBPS,
                 {1700},    // HAL_PHY_RATE_MCS_1NSS_13_MBPS,
@@ -5196,17 +5196,17 @@ const sHalNv nvDefaults =
             0,   //xPA5G;
             0,   //paPolarityTx;
             0,   //paPolarityRx;
-                
+
             0,   //xLNA2G;
             0,   //xLNA5G;
             0,   //xCoupler2G;
             0,   //xCoupler5G;
-                
+
             0,   //xPdet2G;
             0,   //xPdet5G;
             0,   //enableDPD2G;
             1,   //enableDPD5G;
-                
+
             1,   //pdadcSelect2G;
             1,   //pdadcSelect5GLow;
             1,   //pdadcSelect5GMid;
@@ -5244,9 +5244,9 @@ const sHalNv nvDefaults =
             {
                 1400,        //psSlpTimeOvrHd2G;
                 1400,        //psSlpTimeOvrHd5G;
-                
+
                 1600,        //psSlpTimeOvrHdxLNA5G;
-                0,           //nv_TxBBFSel9MHz 
+                0,           //nv_TxBBFSel9MHz
                 0,           //hwParam1
                 0,           //hwParam2
 
@@ -5372,5 +5372,3 @@ const sHalNv nvDefaults =
 };
 
 #endif
-
-
diff --git a/CORE/SERVICES/WMA/wlan_qct_wma_legacy.c b/CORE/SERVICES/WMA/wlan_qct_wma_legacy.c
index 05de49f33719..06dc646b0784 100644
--- a/CORE/SERVICES/WMA/wlan_qct_wma_legacy.c
+++ b/CORE/SERVICES/WMA/wlan_qct_wma_legacy.c
@@ -212,18 +212,18 @@ tSirRetStatus uMacPostCtrlMsg(void* pSirGlobal, tSirMbMsg* pMb)
 /* ---------------------------------------------------------
  * FUNCTION:  WMAGetGlobalSystemRole()
  *
- * Get the global HAL system role. 
+ * Get the global HAL system role.
  * ---------------------------------------------------------
  */
 tBssSystemRole WMAGetGlobalSystemRole(tpAniSirGlobal pMac)
 {
    v_VOID_t * pVosContext = vos_get_global_context(VOS_MODULE_ID_WMA, NULL);
-   t_wma_handle *wmaContext = 
+   t_wma_handle *wmaContext =
                        vos_get_context(VOS_MODULE_ID_WMA, pVosContext);
    if(NULL == wmaContext)
    {
       VOS_TRACE( VOS_MODULE_ID_WMA, VOS_TRACE_LEVEL_ERROR,
-                           "%s:WMA context is NULL", __func__); 
+                           "%s:WMA context is NULL", __func__);
       VOS_ASSERT(0);
       return eSYSTEM_UNKNOWN_ROLE;
    }
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c
index 5d9dbbeedc4f..70102b63d74d 100644
--- a/CORE/SERVICES/WMA/wma.c
+++ b/CORE/SERVICES/WMA/wma.c
@@ -5857,31 +5857,46 @@ static void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params)
 		goto send_resp;
 	}
 
-        peer = ol_txrx_find_peer_by_addr(pdev, intr[vdev_id].bssid, &peer_id);
+	peer = ol_txrx_find_peer_by_addr(pdev, intr[vdev_id].bssid, &peer_id);
 
-        if (peer && (peer->state == ol_txrx_peer_state_conn ||
-                     peer->state == ol_txrx_peer_state_auth)) {
-                /* Trying to change channel while connected should not invoke VDEV_START.
-                 * Instead, use start scan command in passive mode to park station
-                 * on that channel
-                 */
-                WMA_LOGI("%s: calling set_scan, state 0x%x", __func__, wma->roam_preauth_scan_state);
-                if (wma->roam_preauth_scan_state == WMA_ROAM_PREAUTH_CHAN_NONE) {
-                    status = wma_roam_preauth_chan_set(wma, params, vdev_id);
-                    /* response will be asynchronous */
-                    return;
-                } else if (wma->roam_preauth_scan_state == WMA_ROAM_PREAUTH_CHAN_REQUESTED ||
-                               wma->roam_preauth_scan_state == WMA_ROAM_PREAUTH_ON_CHAN) {
-                    status = wma_roam_preauth_chan_cancel(wma, params, vdev_id);
-                    /* response will be asynchronous */
-                    return;
-                } else if (wma->roam_preauth_scan_state == WMA_ROAM_PREAUTH_CHAN_COMPLETED) {
-                        /* Already back on home channel. Complete the request */
-                        wma->roam_preauth_scan_state = WMA_ROAM_PREAUTH_CHAN_NONE;
-                        status = VOS_STATUS_SUCCESS;
-                }
-                goto send_resp;
-        }
+	/*
+	 * Roam offload feature is currently supported
+	 * only in STA mode. Other modes still require
+	 * to issue a Vdev Start/Vdev Restart for
+	 * channel change.
+	 */
+	if ((wma->interfaces[vdev_id].type == WMI_VDEV_TYPE_STA) &&
+		(wma->interfaces[vdev_id].sub_type == 0)) {
+
+		if (peer && (peer->state == ol_txrx_peer_state_conn ||
+			peer->state == ol_txrx_peer_state_auth)) {
+			/* Trying to change channel while connected
+			 * should not invoke VDEV_START.
+			 * Instead, use start scan command in passive
+			 * mode to park station on that channel
+			 */
+			WMA_LOGI("%s: calling set_scan, state 0x%x",
+						__func__, wma->roam_preauth_scan_state);
+			if (wma->roam_preauth_scan_state ==
+				WMA_ROAM_PREAUTH_CHAN_NONE) {
+				status = wma_roam_preauth_chan_set(wma, params, vdev_id);
+				/* response will be asynchronous */
+				return;
+			} else if (wma->roam_preauth_scan_state ==
+				WMA_ROAM_PREAUTH_CHAN_REQUESTED ||
+				wma->roam_preauth_scan_state == WMA_ROAM_PREAUTH_ON_CHAN) {
+				status = wma_roam_preauth_chan_cancel(wma, params, vdev_id);
+				/* response will be asynchronous */
+				return;
+			} else if (wma->roam_preauth_scan_state ==
+				WMA_ROAM_PREAUTH_CHAN_COMPLETED) {
+				/* Already back on home channel. Complete the request */
+				wma->roam_preauth_scan_state = WMA_ROAM_PREAUTH_CHAN_NONE;
+				status = VOS_STATUS_SUCCESS;
+			}
+			goto send_resp;
+		}
+	}
         vos_mem_zero(&req, sizeof(req));
         req.vdev_id = vdev_id;
 	msg = wma_fill_vdev_req(wma, req.vdev_id, WDA_CHNL_SWITCH_REQ,
@@ -15250,6 +15265,9 @@ static int wma_nlo_match_evt_handler(void *handle, u_int8_t *event,
 	if (node)
 		node->nlo_match_evt_received = TRUE;
 
+	vos_wake_lock_timeout_acquire(&wma->pno_wake_lock,
+				      WMA_PNO_WAKE_LOCK_TIMEOUT);
+
 	return 0;
 }
 
@@ -15263,7 +15281,6 @@ static int wma_nlo_scan_cmp_evt_handler(void *handle, u_int8_t *event,
 			(WMI_NLO_SCAN_COMPLETE_EVENTID_param_tlvs *) event;
 	tSirScanOffloadEvent *scan_event;
 	struct wma_txrx_node *node;
-	VOS_STATUS status;
 
 	if (!param_buf) {
 		WMA_LOGE("Invalid NLO scan comp event buffer");
@@ -15283,10 +15300,6 @@ static int wma_nlo_scan_cmp_evt_handler(void *handle, u_int8_t *event,
 		nlo_event->vdev_id);
 		goto skip_pno_cmp_ind;
 	}
-	/* FW need explict stop to really stop PNO operation */
-	status = wma_pno_stop(wma, nlo_event->vdev_id);
-	if (status)
-		WMA_LOGE("Failed to stop PNO scan");
 
 	scan_event = (tSirScanOffloadEvent *) vos_mem_malloc(
 					      sizeof(tSirScanOffloadEvent));
diff --git a/CORE/SERVICES/WMA/wma_isoc.c b/CORE/SERVICES/WMA/wma_isoc.c
index 3fba1a2f0894..e794975193ee 100644
--- a/CORE/SERVICES/WMA/wma_isoc.c
+++ b/CORE/SERVICES/WMA/wma_isoc.c
@@ -63,9 +63,9 @@
 /* ############# function definitions ############ */
 
 /* function   : wma_cfg_nv_get_hal_message_buffer
- * Descriptin :  
- * Args       :        
- * Retruns    :     
+ * Descriptin :
+ * Args       :
+ * Retruns    :
  */
 VOS_STATUS wma_cfg_nv_get_hal_message_buffer(tp_wma_handle wma_handle,
 		v_U16_t req_type, v_U16_t buf_len, v_U8_t **msgbuf,
@@ -95,7 +95,7 @@ end:
  * FUNCTION: wma_prepare_config_tlv
  * Function to prepare CFG for DAL(WDA)
  */
-VOS_STATUS wma_prepare_config_tlv(v_VOID_t *vos_context, 
+VOS_STATUS wma_prepare_config_tlv(v_VOID_t *vos_context,
 		t_wma_start_req  *wma_start_params)
 {
 	/* get mac to acess CFG data base */
@@ -118,14 +118,14 @@ VOS_STATUS wma_prepare_config_tlv(v_VOID_t *vos_context,
 		VOS_ASSERT(0);
 		return VOS_STATUS_E_FAILURE;
 	}
-	cfg_param_sz = (sizeof(tHalCfg) * QWLAN_HAL_CFG_MAX_PARAMS) + 
+	cfg_param_sz = (sizeof(tHalCfg) * QWLAN_HAL_CFG_MAX_PARAMS) +
 		WNI_CFG_STA_ID_LEN +
 		WNI_CFG_EDCA_WME_ACBK_LEN +
 		WNI_CFG_EDCA_WME_ACBE_LEN +
 		WNI_CFG_EDCA_WME_ACVI_LEN +
 		WNI_CFG_EDCA_WME_ACVO_LEN +
 		+ (QWLAN_HAL_CFG_INTEGER_PARAM * sizeof(tANI_U32));
-	/* malloc memory for all configs in one shot */ 
+	/* malloc memory for all configs in one shot */
 	cfg_param = vos_mem_malloc(cfg_param_sz);
 
 	if(NULL == cfg_param ) {
@@ -142,7 +142,7 @@ VOS_STATUS wma_prepare_config_tlv(v_VOID_t *vos_context,
 	/* QWLAN_HAL_CFG_STA_ID */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_STA_ID;
 	cfg_data_val = (tANI_U32*)((v_U8_t *) tlv_struct + sizeof(tHalCfg));
-	if(wlan_cfgGetStr(mac, WNI_CFG_STA_ID, (v_U8_t*)cfg_data_val, &str_len) != 
+	if(wlan_cfgGetStr(mac, WNI_CFG_STA_ID, (v_U8_t*)cfg_data_val, &str_len) !=
 			eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_STA_ID");
@@ -150,119 +150,119 @@ VOS_STATUS wma_prepare_config_tlv(v_VOID_t *vos_context,
 	}
 	tlv_struct->uCfgLen = str_len ;
 	/* calculate the pad bytes to have the CFG in aligned format */
-	tlv_struct->uCfgPadBytes = ALIGNED_WORD_SIZE - 
+	tlv_struct->uCfgPadBytes = ALIGNED_WORD_SIZE -
 		(tlv_struct->uCfgLen & (ALIGNED_WORD_SIZE - 1));
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
 				+ sizeof(tHalCfg) + tlv_struct->uCfgLen + tlv_struct->uCfgPadBytes)) ;
 	/* QWLAN_HAL_CFG_CURRENT_TX_ANTENNA */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_CURRENT_TX_ANTENNA;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_CURRENT_TX_ANTENNA, cfg_data_val ) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_CURRENT_TX_ANTENNA, cfg_data_val )
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_CURRENT_TX_ANTENNA");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
-				+ sizeof(tHalCfg) + tlv_struct->uCfgLen)) ; 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
+				+ sizeof(tHalCfg) + tlv_struct->uCfgLen)) ;
 	/* QWLAN_HAL_CFG_CURRENT_RX_ANTENNA */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_CURRENT_RX_ANTENNA;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_CURRENT_RX_ANTENNA, cfg_data_val) != 
+	if(wlan_cfgGetInt(mac, WNI_CFG_CURRENT_RX_ANTENNA, cfg_data_val) !=
 			eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_CURRENT_RX_ANTENNA");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
-				+ sizeof(tHalCfg) + tlv_struct->uCfgLen)) ; 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
+				+ sizeof(tHalCfg) + tlv_struct->uCfgLen)) ;
 	/* QWLAN_HAL_CFG_LOW_GAIN_OVERRIDE */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_LOW_GAIN_OVERRIDE;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_LOW_GAIN_OVERRIDE, cfg_data_val ) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_LOW_GAIN_OVERRIDE, cfg_data_val )
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_LOW_GAIN_OVERRIDE");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
 				+ sizeof(tHalCfg) + tlv_struct->uCfgLen)) ;
 
 	/* QWLAN_HAL_CFG_POWER_STATE_PER_CHAIN */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_POWER_STATE_PER_CHAIN;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_POWER_STATE_PER_CHAIN, 
+	if(wlan_cfgGetInt(mac, WNI_CFG_POWER_STATE_PER_CHAIN,
 				cfg_data_val ) != eSIR_SUCCESS)	{
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_POWER_STATE_PER_CHAIN");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
-				+ sizeof(tHalCfg) + tlv_struct->uCfgLen)); 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
+				+ sizeof(tHalCfg) + tlv_struct->uCfgLen));
 	/* QWLAN_HAL_CFG_CAL_PERIOD */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_CAL_PERIOD;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_CAL_PERIOD, cfg_data_val ) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_CAL_PERIOD, cfg_data_val )
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_CAL_PERIOD");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
 				+ sizeof(tHalCfg) + tlv_struct->uCfgLen));
 	/* QWLAN_HAL_CFG_CAL_CONTROL  */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_CAL_CONTROL ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_CAL_CONTROL, cfg_data_val ) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_CAL_CONTROL, cfg_data_val )
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_CAL_CONTROL");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
 				+ sizeof(tHalCfg) + tlv_struct->uCfgLen));
 	/* QWLAN_HAL_CFG_PROXIMITY  */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_PROXIMITY ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_PROXIMITY, cfg_data_val ) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_PROXIMITY, cfg_data_val )
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_PROXIMITY");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
-				+ sizeof(tHalCfg) + tlv_struct->uCfgLen)) ; 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
+				+ sizeof(tHalCfg) + tlv_struct->uCfgLen)) ;
 	/* QWLAN_HAL_CFG_NETWORK_DENSITY  */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_NETWORK_DENSITY ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_NETWORK_DENSITY, cfg_data_val ) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_NETWORK_DENSITY, cfg_data_val )
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_NETWORK_DENSITY");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
-				+ sizeof(tHalCfg) + tlv_struct->uCfgLen)); 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
+				+ sizeof(tHalCfg) + tlv_struct->uCfgLen));
 	/* QWLAN_HAL_CFG_MAX_MEDIUM_TIME  */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_MAX_MEDIUM_TIME ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_MAX_MEDIUM_TIME, cfg_data_val ) != 
+	if(wlan_cfgGetInt(mac, WNI_CFG_MAX_MEDIUM_TIME, cfg_data_val ) !=
 			eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_MAX_MEDIUM_TIME");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
-				+ sizeof(tHalCfg) + tlv_struct->uCfgLen)); 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
+				+ sizeof(tHalCfg) + tlv_struct->uCfgLen));
 	/* QWLAN_HAL_CFG_MAX_MPDUS_IN_AMPDU   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_MAX_MPDUS_IN_AMPDU  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
@@ -273,55 +273,55 @@ VOS_STATUS wma_prepare_config_tlv(v_VOID_t *vos_context,
 				"Failed to get value for WNI_CFG_MAX_MPDUS_IN_AMPDU");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
 				+ sizeof(tHalCfg) + tlv_struct->uCfgLen)) ;
 	/* QWLAN_HAL_CFG_RTS_THRESHOLD   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_RTS_THRESHOLD  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_RTS_THRESHOLD, cfg_data_val ) != 
+	if(wlan_cfgGetInt(mac, WNI_CFG_RTS_THRESHOLD, cfg_data_val ) !=
 			eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_RTS_THRESHOLD");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
 				+ sizeof(tHalCfg) + tlv_struct->uCfgLen));
 	/* QWLAN_HAL_CFG_SHORT_RETRY_LIMIT   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_SHORT_RETRY_LIMIT  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_SHORT_RETRY_LIMIT, cfg_data_val ) != 
+	if(wlan_cfgGetInt(mac, WNI_CFG_SHORT_RETRY_LIMIT, cfg_data_val ) !=
 			eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_SHORT_RETRY_LIMIT");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
-				+ sizeof(tHalCfg) + tlv_struct->uCfgLen)) ; 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
+				+ sizeof(tHalCfg) + tlv_struct->uCfgLen)) ;
 	/* QWLAN_HAL_CFG_LONG_RETRY_LIMIT   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_LONG_RETRY_LIMIT  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_LONG_RETRY_LIMIT, cfg_data_val ) != 
+	if(wlan_cfgGetInt(mac, WNI_CFG_LONG_RETRY_LIMIT, cfg_data_val ) !=
 			eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_LONG_RETRY_LIMIT");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
 				+ sizeof(tHalCfg) + tlv_struct->uCfgLen)) ;
 	/* QWLAN_HAL_CFG_FRAGMENTATION_THRESHOLD   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_FRAGMENTATION_THRESHOLD  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_FRAGMENTATION_THRESHOLD, 
+	if(wlan_cfgGetInt(mac, WNI_CFG_FRAGMENTATION_THRESHOLD,
 				cfg_data_val ) != eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_FRAGMENTATION_THRESHOLD");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
 				+ sizeof(tHalCfg) + tlv_struct->uCfgLen)) ;
 	/* QWLAN_HAL_CFG_DYNAMIC_THRESHOLD_ZERO   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_DYNAMIC_THRESHOLD_ZERO  ;
@@ -333,254 +333,254 @@ VOS_STATUS wma_prepare_config_tlv(v_VOID_t *vos_context,
 				"Failed to get value for WNI_CFG_DYNAMIC_THRESHOLD_ZERO");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
 				+ sizeof(tHalCfg) + tlv_struct->uCfgLen));
 
 	/* QWLAN_HAL_CFG_DYNAMIC_THRESHOLD_ONE   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_DYNAMIC_THRESHOLD_ONE  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_DYNAMIC_THRESHOLD_ONE, 
+	if(wlan_cfgGetInt(mac, WNI_CFG_DYNAMIC_THRESHOLD_ONE,
 				cfg_data_val ) != eSIR_SUCCESS)	{
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_DYNAMIC_THRESHOLD_ONE");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
-				+ sizeof(tHalCfg) + tlv_struct->uCfgLen)); 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
+				+ sizeof(tHalCfg) + tlv_struct->uCfgLen));
 	/* QWLAN_HAL_CFG_DYNAMIC_THRESHOLD_TWO   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_DYNAMIC_THRESHOLD_TWO  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_DYNAMIC_THRESHOLD_TWO, 
+	if(wlan_cfgGetInt(mac, WNI_CFG_DYNAMIC_THRESHOLD_TWO,
 				cfg_data_val ) != eSIR_SUCCESS)	{
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_DYNAMIC_THRESHOLD_TWO");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
 				+ sizeof(tHalCfg) + tlv_struct->uCfgLen));
 
 	/* QWLAN_HAL_CFG_FIXED_RATE   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_FIXED_RATE  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_FIXED_RATE, cfg_data_val) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_FIXED_RATE, cfg_data_val)
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_FIXED_RATE");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
 				+ sizeof(tHalCfg) + tlv_struct->uCfgLen));
 
 	/* QWLAN_HAL_CFG_RETRYRATE_POLICY   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_RETRYRATE_POLICY  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_RETRYRATE_POLICY, cfg_data_val ) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_RETRYRATE_POLICY, cfg_data_val )
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_RETRYRATE_POLICY");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
 				+ sizeof(tHalCfg) + tlv_struct->uCfgLen));
 
 	/* QWLAN_HAL_CFG_RETRYRATE_SECONDARY   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_RETRYRATE_SECONDARY  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_RETRYRATE_SECONDARY, 
+	if(wlan_cfgGetInt(mac, WNI_CFG_RETRYRATE_SECONDARY,
 				cfg_data_val ) != eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_RETRYRATE_SECONDARY");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
-				+ sizeof(tHalCfg) + tlv_struct->uCfgLen)) ; 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
+				+ sizeof(tHalCfg) + tlv_struct->uCfgLen)) ;
 	/* QWLAN_HAL_CFG_RETRYRATE_TERTIARY   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_RETRYRATE_TERTIARY  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_RETRYRATE_TERTIARY, 
+	if(wlan_cfgGetInt(mac, WNI_CFG_RETRYRATE_TERTIARY,
 				cfg_data_val ) != eSIR_SUCCESS)	{
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_RETRYRATE_TERTIARY");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct 
-				+ sizeof(tHalCfg) + tlv_struct->uCfgLen)) ; 
+	tlv_struct = (tHalCfg *)(( (v_U8_t *) tlv_struct
+				+ sizeof(tHalCfg) + tlv_struct->uCfgLen)) ;
 	/* QWLAN_HAL_CFG_FORCE_POLICY_PROTECTION   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_FORCE_POLICY_PROTECTION  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_FORCE_POLICY_PROTECTION, 
+	if(wlan_cfgGetInt(mac, WNI_CFG_FORCE_POLICY_PROTECTION,
 				cfg_data_val ) != eSIR_SUCCESS)	{
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_FORCE_POLICY_PROTECTION");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen); 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen);
 	/* QWLAN_HAL_CFG_FIXED_RATE_MULTICAST_24GHZ   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_FIXED_RATE_MULTICAST_24GHZ  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_FIXED_RATE_MULTICAST_24GHZ, 
+	if(wlan_cfgGetInt(mac, WNI_CFG_FIXED_RATE_MULTICAST_24GHZ,
 				cfg_data_val ) != eSIR_SUCCESS)	{
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_FIXED_RATE_MULTICAST_24GHZ");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen); 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen);
 	/* QWLAN_HAL_CFG_FIXED_RATE_MULTICAST_5GHZ   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_FIXED_RATE_MULTICAST_5GHZ  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_FIXED_RATE_MULTICAST_5GHZ, 
+	if(wlan_cfgGetInt(mac, WNI_CFG_FIXED_RATE_MULTICAST_5GHZ,
 				cfg_data_val ) != eSIR_SUCCESS)	{
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_FIXED_RATE_MULTICAST_5GHZ");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen); 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen);
 
 #if 0 /*FIXME_PRIMA : Enable this after the RA is enabled in HAL*/
 	/* QWLAN_HAL_CFG_DEFAULT_RATE_INDEX_24GHZ   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_DEFAULT_RATE_INDEX_24GHZ  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_DEFAULT_RATE_INDEX_24GHZ, 
+	if(wlan_cfgGetInt(mac, WNI_CFG_DEFAULT_RATE_INDEX_24GHZ,
 				cfg_data_val ) != eSIR_SUCCESS)
 	{
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_DEFAULT_RATE_INDEX_24GHZ");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen); 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen);
 #endif
 	/* QWLAN_HAL_CFG_DEFAULT_RATE_INDEX_5GHZ   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_DEFAULT_RATE_INDEX_5GHZ  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_DEFAULT_RATE_INDEX_5GHZ, 
+	if(wlan_cfgGetInt(mac, WNI_CFG_DEFAULT_RATE_INDEX_5GHZ,
 				cfg_data_val ) != eSIR_SUCCESS)	{
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_DEFAULT_RATE_INDEX_5GHZ");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen); 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen);
 	/* QWLAN_HAL_CFG_MAX_BA_SESSIONS   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_MAX_BA_SESSIONS  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_MAX_BA_SESSIONS, cfg_data_val ) != 
+	if(wlan_cfgGetInt(mac, WNI_CFG_MAX_BA_SESSIONS, cfg_data_val ) !=
 			eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_MAX_BA_SESSIONS");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
 			+ sizeof(tHalCfg) + tlv_struct->uCfgLen);
 
 	/* QWLAN_HAL_CFG_PS_DATA_INACTIVITY_TIMEOUT   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_PS_DATA_INACTIVITY_TIMEOUT  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT, 
+	if(wlan_cfgGetInt(mac, WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT,
 				cfg_data_val ) != eSIR_SUCCESS)	{
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen); 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen);
 	/* QWLAN_HAL_CFG_PS_ENABLE_BCN_FILTER   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_PS_ENABLE_BCN_FILTER  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_PS_ENABLE_BCN_FILTER, 
+	if(wlan_cfgGetInt(mac, WNI_CFG_PS_ENABLE_BCN_FILTER,
 				cfg_data_val ) != eSIR_SUCCESS)	{
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_PS_ENABLE_BCN_FILTER");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen); 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen);
 	/* QWLAN_HAL_CFG_PS_ENABLE_RSSI_MONITOR   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_PS_ENABLE_RSSI_MONITOR  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_PS_ENABLE_RSSI_MONITOR, 
+	if(wlan_cfgGetInt(mac, WNI_CFG_PS_ENABLE_RSSI_MONITOR,
 				cfg_data_val ) != eSIR_SUCCESS)	{
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_PS_ENABLE_RSSI_MONITOR");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen); 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen);
 	/* QWLAN_HAL_CFG_NUM_BEACON_PER_RSSI_AVERAGE   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_NUM_BEACON_PER_RSSI_AVERAGE  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE, 
+	if(wlan_cfgGetInt(mac, WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE,
 				cfg_data_val ) != eSIR_SUCCESS)	{
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
 			+ sizeof(tHalCfg) + tlv_struct->uCfgLen);
 
 	/* QWLAN_HAL_CFG_STATS_PERIOD   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_STATS_PERIOD  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_STATS_PERIOD, cfg_data_val ) != 
+	if(wlan_cfgGetInt(mac, WNI_CFG_STATS_PERIOD, cfg_data_val ) !=
 			eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_STATS_PERIOD");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen); 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen);
 	/* QWLAN_HAL_CFG_CFP_MAX_DURATION   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_CFP_MAX_DURATION  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_CFP_MAX_DURATION, cfg_data_val ) != 
+	if(wlan_cfgGetInt(mac, WNI_CFG_CFP_MAX_DURATION, cfg_data_val ) !=
 			eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_CFP_MAX_DURATION");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 	/* QWLAN_HAL_CFG_FRAME_TRANS_ENABLED */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_FRAME_TRANS_ENABLED  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	vos_mem_copy(cfg_data_val, &wma_handle->frameTransRequired, 
+	vos_mem_copy(cfg_data_val, &wma_handle->frameTransRequired,
 			sizeof(tANI_U32));
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 	/* QWLAN_HAL_CFG_DTIM_PERIOD */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_DTIM_PERIOD  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_DTIM_PERIOD, cfg_data_val) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_DTIM_PERIOD, cfg_data_val)
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_DTIM_PERIOD");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 	/* QWLAN_HAL_CFG_EDCA_WMM_ACBK */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_EDCA_WMM_ACBK  ;
 	str_len = WNI_CFG_EDCA_WME_ACBK_LEN;
@@ -593,10 +593,10 @@ VOS_STATUS wma_prepare_config_tlv(v_VOID_t *vos_context,
 	}
 	tlv_struct->uCfgLen = str_len;
 	/* calculate the pad bytes to have the CFG in aligned format */
-	tlv_struct->uCfgPadBytes = ALIGNED_WORD_SIZE - 
+	tlv_struct->uCfgPadBytes = ALIGNED_WORD_SIZE -
 		(tlv_struct->uCfgLen & (ALIGNED_WORD_SIZE - 1));
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen + tlv_struct->uCfgPadBytes) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen + tlv_struct->uCfgPadBytes) ;
 	/* QWLAN_HAL_CFG_EDCA_WMM_ACBE */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_EDCA_WMM_ACBE  ;
 	str_len = WNI_CFG_EDCA_WME_ACBE_LEN;
@@ -609,10 +609,10 @@ VOS_STATUS wma_prepare_config_tlv(v_VOID_t *vos_context,
 	}
 	tlv_struct->uCfgLen = str_len;
 	/* calculate the pad bytes to have the CFG in aligned format */
-	tlv_struct->uCfgPadBytes = ALIGNED_WORD_SIZE - 
+	tlv_struct->uCfgPadBytes = ALIGNED_WORD_SIZE -
 		(tlv_struct->uCfgLen & (ALIGNED_WORD_SIZE - 1));
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen + tlv_struct->uCfgPadBytes) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen + tlv_struct->uCfgPadBytes) ;
 	/* QWLAN_HAL_CFG_EDCA_WMM_ACVI */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_EDCA_WMM_ACVO  ;
 	str_len = WNI_CFG_EDCA_WME_ACVI_LEN;
@@ -625,10 +625,10 @@ VOS_STATUS wma_prepare_config_tlv(v_VOID_t *vos_context,
 	}
 	tlv_struct->uCfgLen = str_len;
 	/* calculate the pad bytes to have the CFG in aligned format */
-	tlv_struct->uCfgPadBytes = ALIGNED_WORD_SIZE - 
+	tlv_struct->uCfgPadBytes = ALIGNED_WORD_SIZE -
 		(tlv_struct->uCfgLen & (ALIGNED_WORD_SIZE - 1));
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen + tlv_struct->uCfgPadBytes) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen + tlv_struct->uCfgPadBytes) ;
 	/* QWLAN_HAL_CFG_EDCA_WMM_ACVO */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_EDCA_WMM_ACVI  ;
 	str_len = WNI_CFG_EDCA_WME_ACVO_LEN;
@@ -641,143 +641,143 @@ VOS_STATUS wma_prepare_config_tlv(v_VOID_t *vos_context,
 	}
 	tlv_struct->uCfgLen = str_len;
 	/* calculate the pad bytes to have the CFG in aligned format */
-	tlv_struct->uCfgPadBytes = ALIGNED_WORD_SIZE - 
+	tlv_struct->uCfgPadBytes = ALIGNED_WORD_SIZE -
 		(tlv_struct->uCfgLen & (ALIGNED_WORD_SIZE - 1));
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen + tlv_struct->uCfgPadBytes) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen + tlv_struct->uCfgPadBytes) ;
 	/* QWLAN_HAL_CFG_BA_THRESHOLD_HIGH */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_BA_THRESHOLD_HIGH  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_BA_THRESHOLD_HIGH, cfg_data_val) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_BA_THRESHOLD_HIGH, cfg_data_val)
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_BA_THRESHOLD_HIGH");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 	/* QWLAN_HAL_CFG_MAX_BA_BUFFERS */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_MAX_BA_BUFFERS  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_MAX_BA_BUFFERS, cfg_data_val) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_MAX_BA_BUFFERS, cfg_data_val)
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_MAX_BA_BUFFERS");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 	/* QWLAN_HAL_CFG_DYNAMIC_PS_POLL_VALUE */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_DYNAMIC_PS_POLL_VALUE  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_DYNAMIC_PS_POLL_VALUE, cfg_data_val) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_DYNAMIC_PS_POLL_VALUE, cfg_data_val)
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_DYNAMIC_PS_POLL_VALUE");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 	/* QWLAN_HAL_CFG_TELE_BCN_TRANS_LI */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_TELE_BCN_TRANS_LI  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_TELE_BCN_TRANS_LI, cfg_data_val) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_TELE_BCN_TRANS_LI, cfg_data_val)
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_TELE_BCN_TRANS_LI");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 	/* QWLAN_HAL_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS, cfg_data_val) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS, cfg_data_val)
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 	/* QWLAN_HAL_CFG_TELE_BCN_MAX_LI */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_TELE_BCN_MAX_LI  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_TELE_BCN_MAX_LI, cfg_data_val) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_TELE_BCN_MAX_LI, cfg_data_val)
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_TELE_BCN_MAX_LI");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 	/* QWLAN_HAL_CFG_TELE_BCN_MAX_LI_IDLE_BCNS */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_TELE_BCN_MAX_LI_IDLE_BCNS  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS, cfg_data_val) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS, cfg_data_val)
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 	/* QWLAN_HAL_CFG_TELE_BCN_WAKEUP_EN */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_TELE_BCN_WAKEUP_EN  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_TELE_BCN_WAKEUP_EN, cfg_data_val) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_TELE_BCN_WAKEUP_EN, cfg_data_val)
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_TELE_BCN_WAKEUP_EN");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 	/* QWLAN_HAL_CFG_INFRA_STA_KEEP_ALIVE_PERIOD */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_INFRA_STA_KEEP_ALIVE_PERIOD  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD, cfg_data_val) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD, cfg_data_val)
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 	/*QWLAN_HAL_CFG_TX_PWR_CTRL_ENABLE*/
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_TX_PWR_CTRL_ENABLE  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_TX_PWR_CTRL_ENABLE, cfg_data_val) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_TX_PWR_CTRL_ENABLE, cfg_data_val)
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_TX_PWR_CTRL_ENABLE");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
 			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 	/* QWLAN_HAL_CFG_ENABLE_CLOSE_LOOP   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_ENABLE_CLOSE_LOOP  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_ENABLE_CLOSE_LOOP, cfg_data_val) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_ENABLE_CLOSE_LOOP, cfg_data_val)
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_ENABLE_CLOSE_LOOP");
 		goto handle_failure;
 	}
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
-	/* [COEX] strictly speaking, the Coex parameters are not part of the WLAN_CFG_FILE binary, 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
+	/* [COEX] strictly speaking, the Coex parameters are not part of the WLAN_CFG_FILE binary,
 	 * but are from the WLAN_INI_FILE file.  However, this is the only parameter download routine
 	 * into FW, so the parameters are added here.
 	 */
@@ -785,126 +785,126 @@ VOS_STATUS wma_prepare_config_tlv(v_VOID_t *vos_context,
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_BTC_EXECUTION_MODE  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	*cfg_data_val = mac->btc.btcConfig.btcExecutionMode; 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	*cfg_data_val = mac->btc.btcConfig.btcExecutionMode;
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 	/* [COEX] QWLAN_HAL_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	*cfg_data_val = mac->btc.btcConfig.btcConsBtSlotsToBlockDuringDhcp; 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	*cfg_data_val = mac->btc.btcConfig.btcConsBtSlotsToBlockDuringDhcp;
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 	/* [COEX] QWLAN_HAL_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	*cfg_data_val = mac->btc.btcConfig.btcA2DPBtSubIntervalsDuringDhcp; 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	*cfg_data_val = mac->btc.btcConfig.btcA2DPBtSubIntervalsDuringDhcp;
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 	/* [COEX] QWLAN_HAL_CFG_BTC_STATIC_LEN_INQ_BT */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_BTC_STATIC_LEN_INQ_BT  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	*cfg_data_val = mac->btc.btcConfig.btcStaticLenInqBt; 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	*cfg_data_val = mac->btc.btcConfig.btcStaticLenInqBt;
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 
 	/* [COEX] QWLAN_HAL_CFG_BTC_STATIC_LEN_PAGE_BT */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_BTC_STATIC_LEN_PAGE_BT  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	*cfg_data_val = mac->btc.btcConfig.btcStaticLenPageBt; 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	*cfg_data_val = mac->btc.btcConfig.btcStaticLenPageBt;
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 
 	/* [COEX] QWLAN_HAL_CFG_BTC_STATIC_LEN_CONN_BT */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_BTC_STATIC_LEN_CONN_BT  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	*cfg_data_val = mac->btc.btcConfig.btcStaticLenConnBt; 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	*cfg_data_val = mac->btc.btcConfig.btcStaticLenConnBt;
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 
 	/* [COEX] QWLAN_HAL_CFG_BTC_STATIC_LEN_LE_BT */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_BTC_STATIC_LEN_LE_BT  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	*cfg_data_val = mac->btc.btcConfig.btcStaticLenLeBt; 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	*cfg_data_val = mac->btc.btcConfig.btcStaticLenLeBt;
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 
 	/* [COEX] QWLAN_HAL_CFG_BTC_STATIC_LEN_INQ_WLAN */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_BTC_STATIC_LEN_INQ_WLAN  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	*cfg_data_val = mac->btc.btcConfig.btcStaticLenInqWlan; 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	*cfg_data_val = mac->btc.btcConfig.btcStaticLenInqWlan;
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 
 	/* [COEX] QWLAN_HAL_CFG_BTC_STATIC_LEN_PAGE_WLAN */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_BTC_STATIC_LEN_PAGE_WLAN  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	*cfg_data_val = mac->btc.btcConfig.btcStaticLenPageWlan; 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	*cfg_data_val = mac->btc.btcConfig.btcStaticLenPageWlan;
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 
 	/* [COEX] QWLAN_HAL_CFG_BTC_STATIC_LEN_CONN_WLAN */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_BTC_STATIC_LEN_CONN_WLAN  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	*cfg_data_val = mac->btc.btcConfig.btcStaticLenConnWlan; 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	*cfg_data_val = mac->btc.btcConfig.btcStaticLenConnWlan;
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 
 	/* [COEX] QWLAN_HAL_CFG_BTC_STATIC_LEN_LE_WLAN */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_BTC_STATIC_LEN_LE_WLAN  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	*cfg_data_val = mac->btc.btcConfig.btcStaticLenLeWlan; 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	*cfg_data_val = mac->btc.btcConfig.btcStaticLenLeWlan;
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 
 	/* [COEX] QWLAN_HAL_CFG_BTC_DYN_MAX_LEN_BT */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_BTC_DYN_MAX_LEN_BT  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	*cfg_data_val = mac->btc.btcConfig.btcDynMaxLenBt; 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	*cfg_data_val = mac->btc.btcConfig.btcDynMaxLenBt;
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 
 	/* [COEX] QWLAN_HAL_CFG_BTC_DYN_MAX_LEN_WLAN */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_BTC_DYN_MAX_LEN_WLAN  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	*cfg_data_val = mac->btc.btcConfig.btcDynMaxLenWlan; 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	*cfg_data_val = mac->btc.btcConfig.btcDynMaxLenWlan;
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 
 	/* [COEX] QWLAN_HAL_CFG_BTC_MAX_SCO_BLOCK_PERC */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_BTC_MAX_SCO_BLOCK_PERC  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	*cfg_data_val = mac->btc.btcConfig.btcMaxScoBlockPerc; 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	*cfg_data_val = mac->btc.btcConfig.btcMaxScoBlockPerc;
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 
 	/* [COEX] QWLAN_HAL_CFG_BTC_DHCP_PROT_ON_A2DP */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_BTC_DHCP_PROT_ON_A2DP  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	*cfg_data_val = mac->btc.btcConfig.btcDhcpProtOnA2dp; 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	*cfg_data_val = mac->btc.btcConfig.btcDhcpProtOnA2dp;
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 
 	/* [COEX] QWLAN_HAL_CFG_BTC_DHCP_PROT_ON_SCO */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_BTC_DHCP_PROT_ON_SCO  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	*cfg_data_val = mac->btc.btcConfig.btcDhcpProtOnSco; 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	*cfg_data_val = mac->btc.btcConfig.btcDhcpProtOnSco;
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 	/*TODO: what to send ?*/
 #if 0
 	/* QWLAN_HAL_CFG_WCNSS_API_VERSION */
@@ -916,63 +916,63 @@ VOS_STATUS wma_prepare_config_tlv(v_VOID_t *vos_context,
 			wcnssCompiledApiVersion.minor,
 			wcnssCompiledApiVersion.version,
 			wcnssCompiledApiVersion.revision);
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 #endif
 	/* QWLAN_HAL_CFG_AP_KEEPALIVE_TIMEOUT   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_AP_KEEPALIVE_TIMEOUT  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_AP_KEEP_ALIVE_TIMEOUT, 
+	if(wlan_cfgGetInt(mac, WNI_CFG_AP_KEEP_ALIVE_TIMEOUT,
 				cfg_data_val ) != eSIR_SUCCESS)	{
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_AP_KEEP_ALIVE_TIMEOUT");
 		goto handle_failure;
 	}
 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 	/* QWLAN_HAL_CFG_GO_KEEPALIVE_TIMEOUT   */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_GO_KEEPALIVE_TIMEOUT  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_GO_KEEP_ALIVE_TIMEOUT, 
+	if(wlan_cfgGetInt(mac, WNI_CFG_GO_KEEP_ALIVE_TIMEOUT,
 				cfg_data_val ) != eSIR_SUCCESS)	{
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_GO_KEEP_ALIVE_TIMEOUT");
 		goto handle_failure;
 	}
 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 
 	/* QWLAN_HAL_CFG_ENABLE_MC_ADDR_LIST */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_ENABLE_MC_ADDR_LIST;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_ENABLE_MC_ADDR_LIST, cfg_data_val) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_ENABLE_MC_ADDR_LIST, cfg_data_val)
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_ENABLE_MC_ADDR_LIST");
 		goto handle_failure;
 	}
 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 
 	/* QWLAN_HAL_CFG_ENABLE_UNICAST_FILTER */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_ENABLE_UNICAST_FILTER;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_ENABLE_UC_FILTER, cfg_data_val) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_ENABLE_UC_FILTER, cfg_data_val)
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_ENABLE_UC_FILTER");
 		goto handle_failure;
 	}
 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 #ifdef WLAN_SOFTAP_VSTA_FEATURE
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_MAX_ASSOC_LIMIT;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
@@ -991,29 +991,29 @@ VOS_STATUS wma_prepare_config_tlv(v_VOID_t *vos_context,
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_ENABLE_LPWR_IMG_TRANSITION  ;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
-	if(wlan_cfgGetInt(mac, WNI_CFG_ENABLE_LPWR_IMG_TRANSITION, cfg_data_val) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_ENABLE_LPWR_IMG_TRANSITION, cfg_data_val)
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_ENABLE_LPWR_IMG_TRANSITION");
 		goto handle_failure;
 	}
 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
-			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ; 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
+			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 
 	/* QWLAN_HAL_CFG_ENABLE_MCC_ADAPTIVE_SCHEDULER */
 	tlv_struct->uCfgId = QWLAN_HAL_CFG_ENABLE_MCC_ADAPTIVE_SCHEDULER;
 	tlv_struct->uCfgLen = sizeof(tANI_U32);
 	cfg_data_val = (tANI_U32 *)(tlv_struct + 1);
 
-	if(wlan_cfgGetInt(mac, WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED, cfg_data_val) 
+	if(wlan_cfgGetInt(mac, WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED, cfg_data_val)
 			!= eSIR_SUCCESS) {
 		VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
 				"Failed to get value for WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED");
 		goto handle_failure;
 	}
 
-	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct 
+	tlv_struct = (tHalCfg *)( (v_U8_t *) tlv_struct
 			+ sizeof(tHalCfg) + tlv_struct->uCfgLen) ;
 
 	wma_start_params->usConfigBufferLen = (v_U8_t *)tlv_struct - tlv_struct_start ;
@@ -1024,7 +1024,7 @@ VOS_STATUS wma_prepare_config_tlv(v_VOID_t *vos_context,
 				"****** Dumping CFG TLV ***** ");
 		for (i=0; (i+7) < wma_start_params->usConfigBufferLen; i+=8) {
 			VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
-					"%02x %02x %02x %02x %02x %02x %02x %02x", 
+					"%02x %02x %02x %02x %02x %02x %02x %02x",
 					tlv_struct_start[i],
 					tlv_struct_start[i+1],
 					tlv_struct_start[i+2],
@@ -1049,10 +1049,10 @@ handle_failure:
 	return VOS_STATUS_E_FAILURE;
 }
 
-/* function:    
- * Descriptin:  
- * Args:        
- * Retruns:     
+/* function:
+ * Descriptin:
+ * Args:
+ * Retruns:
  */
 VOS_STATUS wma_nv_download_start(void *vos_context)
 {
@@ -1071,7 +1071,7 @@ VOS_STATUS wma_nv_download_start(void *vos_context)
 	v_U16_t no_pkts = 0;
 	v_U16_t frag_num = 0;
 
-	WMA_LOGD("Enter");	
+	WMA_LOGD("Enter");
 	/* Fill hal msg*/
 	/* halMsgHeader+driverType+configbuffer*/
 	/*-----------------------------------------------------------------------
@@ -1083,7 +1083,7 @@ VOS_STATUS wma_nv_download_start(void *vos_context)
 	no_pkts = TOTALFRAGMENTS(length);
 	last_frag_len = length % FRAGMENT_SIZE;
 
-	WMA_LOGD("no_pkts = %hu, last_frag_len = %hu", 
+	WMA_LOGD("no_pkts = %hu, last_frag_len = %hu",
 			no_pkts, last_frag_len);
 	// Download FRAGMENT_SIZE packets
 	if (no_pkts > 1) {
@@ -1268,10 +1268,10 @@ end:
 	WMA_LOGD("Exit");
 	return vos_status;
 }
-/* function   : wma_get_hal_drv_type 
- * Descriptin :  
- * Args       :        
- * Retruns    :     
+/* function   : wma_get_hal_drv_type
+ * Descriptin :
+ * Args       :
+ * Retruns    :
  */
 tDriverType wma_get_hal_drv_type(t_wma_drv_type wma_driver_type)
 {
@@ -1288,9 +1288,9 @@ tDriverType wma_get_hal_drv_type(t_wma_drv_type wma_driver_type)
 }
 
 /* function   : wma_cfg_download_isoc
- * Descriptin :  
- * Args       :        
- * Retruns    :     
+ * Descriptin :
+ * Args       :
+ * Retruns    :
  */
 VOS_STATUS wma_cfg_download_isoc(v_VOID_t *vos_context, tp_wma_handle wma_handle)
 {
@@ -1403,10 +1403,10 @@ end:
 	return vos_status;
 }
 
-/* function   : wma_cfg_nv_download_complete    
- * Descriptin :  
- * Args       :        
- * Retruns    :     
+/* function   : wma_cfg_nv_download_complete
+ * Descriptin :
+ * Args       :
+ * Retruns    :
  */
 v_VOID_t wma_cfg_nv_download_complete(WMA_HANDLE handle, HTC_PACKET *htc_pkt)
 {
@@ -1484,10 +1484,10 @@ void wma_cfg_nv_rx(WMA_HANDLE handle, HTC_PACKET *htc_pkt)
 					!= VOS_STATUS_SUCCESS))
 		WMA_LOGE("Failed to set the event");
 }
-/* function   : wma_htc_cfg_nv_connect_service    
- * Descriptin :  
- * Args       :        
- * Retruns    :     
+/* function   : wma_htc_cfg_nv_connect_service
+ * Descriptin :
+ * Args       :
+ * Retruns    :
  */
 VOS_STATUS wma_htc_cfg_nv_connect_service(tp_wma_handle wma_handle)
 {
@@ -1496,7 +1496,7 @@ VOS_STATUS wma_htc_cfg_nv_connect_service(tp_wma_handle wma_handle)
 	A_STATUS status = A_OK;
 	VOS_STATUS vos_status = VOS_STATUS_SUCCESS;
 
-	WMA_LOGD("Enter");	
+	WMA_LOGD("Enter");
 
 	/* meta data is unused for now */
 	connect_req.pMetaData = NULL;
@@ -1504,34 +1504,34 @@ VOS_STATUS wma_htc_cfg_nv_connect_service(tp_wma_handle wma_handle)
 
 	/* these fields are the same for all service endpoints */
 	connect_req.EpCallbacks.pContext = wma_handle;
-	connect_req.EpCallbacks.EpTxCompleteMultiple = NULL; 
+	connect_req.EpCallbacks.EpTxCompleteMultiple = NULL;
 	connect_req.EpCallbacks.EpRecv = wma_cfg_nv_rx;
-	connect_req.EpCallbacks.EpRecvRefill = NULL; 
-	connect_req.EpCallbacks.EpSendFull = NULL; 
+	connect_req.EpCallbacks.EpRecvRefill = NULL;
+	connect_req.EpCallbacks.EpSendFull = NULL;
 	connect_req.EpCallbacks.EpTxComplete = wma_cfg_nv_download_complete;
 
 	/* connect to control service */
 	connect_req.ServiceID = CFG_NV_SVC;
-	
+
 	status = HTCConnectService(wma_handle->htc_handle, &connect_req, &connect_resp);
-	
+
 	if (A_OK != status) {
-		WMA_LOGP("Failed to connect htc endpoint for cfg nv");	
+		WMA_LOGP("Failed to connect htc endpoint for cfg nv");
 		vos_status = VOS_STATUS_SUCCESS;
 		goto end;
 	}
 
 	if (HTC_SERVICE_SUCCESS == connect_resp.ConnectRespCode) {
-		WMA_LOGA("WMA --> HTCConnectService(CFG_NV_SVC) - success");	
+		WMA_LOGA("WMA --> HTCConnectService(CFG_NV_SVC) - success");
 		wma_handle->cfg_nv.endpoint_id = connect_resp.Endpoint;
 		vos_status = VOS_STATUS_SUCCESS;
 	}
 	else {
-		WMA_LOGP("HTCConnectService failed for cfg nv");	
+		WMA_LOGP("HTCConnectService failed for cfg nv");
 		vos_status = VOS_STATUS_E_FAILURE;
 	}
 end:
-	WMA_LOGD("Exit");	
+	WMA_LOGD("Exit");
 	return vos_status;
 }
 
diff --git a/CORE/SERVICES/WMA/wma_stub.h b/CORE/SERVICES/WMA/wma_stub.h
index a0a2393ab8a8..ae46e559712b 100644
--- a/CORE/SERVICES/WMA/wma_stub.h
+++ b/CORE/SERVICES/WMA/wma_stub.h
@@ -68,13 +68,13 @@ static inline VOS_STATUS WMA_HALDumpCmdReq(tpAniSirGlobal   pMac, tANI_U32  cmd,
 	return VOS_STATUS_SUCCESS;
 }
 
-static inline void WMA_TrafficStatsTimerActivate(v_BOOL_t activate) 
+static inline void WMA_TrafficStatsTimerActivate(v_BOOL_t activate)
 {
 	return;
 }
 
 static inline VOS_STATUS WMA_GetWcnssWlanReportedVersion(v_PVOID_t pvosGCtx,
-		tSirVersionType *pVersion) 
+		tSirVersionType *pVersion)
 {
 	return VOS_STATUS_SUCCESS;
 }
@@ -89,4 +89,3 @@ static inline void WMA_UpdateRssiBmps(v_PVOID_t pvosGCtx,
 }
 
 #endif
-
diff --git a/CORE/SERVICES/WMI/wmi_tlv_helper.c b/CORE/SERVICES/WMI/wmi_tlv_helper.c
index 48d80863a5d0..e61d51a13b57 100644
--- a/CORE/SERVICES/WMI/wmi_tlv_helper.c
+++ b/CORE/SERVICES/WMI/wmi_tlv_helper.c
@@ -1006,4 +1006,3 @@ wmi_cmp_and_set_abi_version(int num_whitelist, wmi_whitelist_version_info *versi
         return 0; /* Compatible */
     }
 }
-
diff --git a/CORE/SERVICES/WMI/wmi_tlv_platform.c b/CORE/SERVICES/WMI/wmi_tlv_platform.c
index 3cea5cd75840..09091b589bc1 100644
--- a/CORE/SERVICES/WMI/wmi_tlv_platform.c
+++ b/CORE/SERVICES/WMI/wmi_tlv_platform.c
@@ -56,4 +56,3 @@
       }
   #define wmi_tlv_os_mem_free   adf_os_mem_free
 #endif
-
diff --git a/CORE/SERVICES/WMI/wmi_unified.c b/CORE/SERVICES/WMI/wmi_unified.c
index 88784aa6ca51..eee3d814d2d2 100644
--- a/CORE/SERVICES/WMI/wmi_unified.c
+++ b/CORE/SERVICES/WMI/wmi_unified.c
@@ -842,7 +842,7 @@ wmi_unified_connect_htc_service(struct wmi_unified * wmi_handle, void *htc_handl
     }
     wmi_handle->wmi_endpoint_id = response.Endpoint;
     wmi_handle->htc_handle = htc_handle;
-    
+
     return EOK;
 }
 
diff --git a/CORE/SME/src/pmc/pmcApi.c b/CORE/SME/src/pmc/pmcApi.c
index 36d24423683d..3ab8fbdecbe4 100644
--- a/CORE/SME/src/pmc/pmcApi.c
+++ b/CORE/SME/src/pmc/pmcApi.c
@@ -3011,7 +3011,11 @@ eHalStatus pmcSetPreferredNetworkList
 
     if (pMac->pnoOffload)
     {
-       sme_MoveCsrToScanStateForPno(hHal, sessionId);
+       if (pRequestBuf->enable)
+       {
+           sme_MoveCsrToScanStateForPno(hHal, sessionId);
+       }
+
        pRequestBuf->sessionId = sessionId;
     }
 
diff --git a/CORE/SME/src/rrm/sme_rrm.c b/CORE/SME/src/rrm/sme_rrm.c
index b86a1a6dee1d..ac56da3b1e28 100644
--- a/CORE/SME/src/rrm/sme_rrm.c
+++ b/CORE/SME/src/rrm/sme_rrm.c
@@ -686,7 +686,12 @@ eHalStatus sme_RrmIssueScanReq( tpAniSirGlobal pMac )
    if ((pSmeRrmContext->currentIndex) >= pSmeRrmContext->channelList.numOfChannels)
        return status;
 
-   scanType = pSmeRrmContext->measMode[pSmeRrmContext->currentIndex];
+   if( eRRM_MSG_SOURCE_CCX_UPLOAD == pSmeRrmContext->msgSource ||
+       eRRM_MSG_SOURCE_LEGACY_CCX == pSmeRrmContext->msgSource )
+       scanType = pSmeRrmContext->measMode[pSmeRrmContext->currentIndex];
+   else
+       scanType = pSmeRrmContext->measMode[0];
+
    if ((eSIR_ACTIVE_SCAN == scanType) || (eSIR_PASSIVE_SCAN == scanType))
    {
 #if defined WLAN_VOWIFI_DEBUG
@@ -721,7 +726,12 @@ eHalStatus sme_RrmIssueScanReq( tpAniSirGlobal pMac )
 
        /* set min and max channel time */
        scanRequest.minChnTime = 0; //pSmeRrmContext->duration; Dont use min timeout.
-       scanRequest.maxChnTime = pSmeRrmContext->duration[pSmeRrmContext->currentIndex];
+       if( eRRM_MSG_SOURCE_CCX_UPLOAD == pSmeRrmContext->msgSource ||
+           eRRM_MSG_SOURCE_LEGACY_CCX == pSmeRrmContext->msgSource )
+           scanRequest.maxChnTime = pSmeRrmContext->duration[pSmeRrmContext->currentIndex];
+       else
+           scanRequest.maxChnTime = pSmeRrmContext->duration[0];
+
        smsLog( pMac, LOG1, "Scan Type(%d) Max Dwell Time(%d)", scanRequest.scanType,
                   scanRequest.maxChnTime );
 
@@ -885,8 +895,8 @@ void sme_RrmProcessBeaconReportReqInd(tpAniSirGlobal pMac, void *pMsgBuf)
 
    pSmeRrmContext->token = pBeaconReq->uDialogToken;
    pSmeRrmContext->regClass = pBeaconReq->channelInfo.regulatoryClass;
-         pSmeRrmContext->randnIntvl = VOS_MAX( pBeaconReq->randomizationInterval, pSmeRrmContext->rrmConfig.maxRandnInterval );
-         pSmeRrmContext->currentIndex = 0;
+   pSmeRrmContext->randnIntvl = VOS_MAX( pBeaconReq->randomizationInterval, pSmeRrmContext->rrmConfig.maxRandnInterval );
+   pSmeRrmContext->currentIndex = 0;
    pSmeRrmContext->msgSource = pBeaconReq->msgSource;
    vos_mem_copy((tANI_U8*)&pSmeRrmContext->measMode, (tANI_U8*)&pBeaconReq->fMeasurementtype, SIR_CCX_MAX_MEAS_IE_REQS);
    vos_mem_copy((tANI_U8*)&pSmeRrmContext->duration, (tANI_U8*)&pBeaconReq->measurementDuration, SIR_CCX_MAX_MEAS_IE_REQS);
diff --git a/CORE/SVC/external/wlan_nlink_common.h b/CORE/SVC/external/wlan_nlink_common.h
index f3422a036c74..3ee14935a9bc 100644
--- a/CORE/SVC/external/wlan_nlink_common.h
+++ b/CORE/SVC/external/wlan_nlink_common.h
@@ -83,7 +83,9 @@
 
 // Special Message Type used by SoftAP, intercepted by send_btc_nlink_msg() and
 // replaced by WLAN_STA_ASSOC_DONE_IND
-#define WLAN_BTC_SOFTAP_BSS_START      0x11
+#define WLAN_BTC_SOFTAP_BSS_START   0x11
+#define WLAN_SVC_FW_CRASHED_IND     0x100
+#define WLAN_SVC_LTE_COEX_IND       0x101
 
 
 // Event data for WLAN_BTC_QUERY_STATE_RSP & WLAN_STA_ASSOC_DONE_IND
@@ -98,9 +100,8 @@ typedef enum eAniNlModuleTypes {
    ANI_NL_MSG_PUMAC = ANI_NL_MSG_BASE + 0x01,// PTT Socket App
    ANI_NL_MSG_PTT   = ANI_NL_MSG_BASE + 0x07,// Quarky GUI
    WLAN_NL_MSG_BTC,
-#ifdef QCA_WIFI_2_0
    WLAN_NL_MSG_OEM,
-#endif
+   WLAN_NL_MSG_SVC,
    ANI_NL_MSG_MAX  
 } tAniNlModTypes, tWlanNlModTypes;
 
diff --git a/CORE/SYS/common/inc/wlan_qct_sys.h b/CORE/SYS/common/inc/wlan_qct_sys.h
index f45b7db10c47..24f8e9e7be88 100644
--- a/CORE/SYS/common/inc/wlan_qct_sys.h
+++ b/CORE/SYS/common/inc/wlan_qct_sys.h
@@ -423,4 +423,3 @@ void wlan_sys_probe(void);
 
 
 #endif  // WLAN_QCT_SYS_H__
-
diff --git a/CORE/SYS/common/src/wlan_qct_sys.c b/CORE/SYS/common/src/wlan_qct_sys.c
index b84aa81de21f..96cd5967a65a 100644
--- a/CORE/SYS/common/src/wlan_qct_sys.c
+++ b/CORE/SYS/common/src/wlan_qct_sys.c
@@ -331,7 +331,7 @@ VOS_STATUS sysMcProcessMsg( v_CONTEXT_t pVosContext, vos_msg_t *pMsg )
       {
          case SYS_MSG_ID_MC_START:
          {
-            /* Handling for this message is not needed now so adding 
+            /* Handling for this message is not needed now so adding
              *debug print and VOS_ASSERT*/
             VOS_TRACE( VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_ERROR,
                        " Received SYS_MSG_ID_MC_START message msgType= %d [0x%08x]",
@@ -419,7 +419,7 @@ VOS_STATUS sysMcProcessMsg( v_CONTEXT_t pVosContext, vos_msg_t *pMsg )
                        "MC message type= %d [0x%08X]", pMsg->type, pMsg->type );
 
             vosStatus = VOS_STATUS_E_BADMSG;
-            if (pMsg->bodyptr) 
+            if (pMsg->bodyptr)
                vos_mem_free(pMsg->bodyptr);
             break;
          }
@@ -452,7 +452,7 @@ VOS_STATUS sysTxProcessMsg( v_CONTEXT_t pVosContext, vos_msg_t *pMsg )
          // function that is in the message.
          case SYS_MSG_ID_TX_THR_PROBE:
          {
-           /* Handling for this message is not needed now so adding 
+           /* Handling for this message is not needed now so adding
             * debug print and VOS_ASSERT*/
             VOS_TRACE( VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_ERROR,
                        " Received SYS_MSG_ID_TX_THR_PROBE message msgType= %d [0x%08x]",
@@ -753,4 +753,3 @@ void wlan_sys_probe(void)
 
     return;
 }
-
diff --git a/CORE/SYS/legacy/src/pal/inc/palApi.h b/CORE/SYS/legacy/src/pal/inc/palApi.h
index 5f136a28c9c8..5f8572093411 100644
--- a/CORE/SYS/legacy/src/pal/inc/palApi.h
+++ b/CORE/SYS/legacy/src/pal/inc/palApi.h
@@ -45,20 +45,20 @@
 
 /**
     \mainpage Platform Abstraction Layer (PAL)
-    
+
     \section intro Introduction
-    
+
     palApi is the Platform Abstration Layer.
-    
-    This is the latest attempt to abstract the entire Platform, including the 
-    hardware, chip, OS and Bus into a generic API.  We are doing this to give 
+
+    This is the latest attempt to abstract the entire Platform, including the
+    hardware, chip, OS and Bus into a generic API.  We are doing this to give
     the MAC the ability to call
-    generic APIs that will allow the MAC to function in an abstract manner 
+    generic APIs that will allow the MAC to function in an abstract manner
     with any Airgo chipset, on any supported OS (Windows and Linux for now)
     across any system bus interface (PCI, PCIe, Cardbus, USB, etc.).
-    
+
     \todo
-    - palReadRegister:  register read 
+    - palReadRegister:  register read
         -# add an Open/Close abstraction to accomodate the PAL before the entire MAC is loaded.
         -# Review with Linux folks to see this basic scructure works for them.
         -# Figure out how to organize the directory structure
@@ -67,10 +67,10 @@
     - palTx: an abstraction for transmit frames that manages the Td and Tm rings
     - palRx: an abstracion for receiving frames from a chip across any of the supported buses
     - palInterrupt: abstract the interrupts into the HAL
-    
-    
+
+
     \section impl_notes Implementation Notes
-    
+
     \subsection subsection_codeStructure Code strucure
 
  */
@@ -81,18 +81,18 @@
     \fn palReadRegister
 
     \brief chip and bus agnostic funtion to read a register value
-    
+
     \param hHdd - HDD context handle
-    
+
     \param regAddress - address (offset) of the register to be read from the start
     of register space.
-    
+
     \param pRegValue - pointer to the memory where the register contents are written
-    
-    \return eHalStatus - status of the register read.  Note that this function 
-    can fail.  In particular, when the card is removed, this function will return 
+
+    \return eHalStatus - status of the register read.  Note that this function
+    can fail.  In particular, when the card is removed, this function will return
     a failure.
-    
+
   -------------------------------------------------------------------------------*/
 eHalStatus palReadRegister( tHddHandle hHdd, tANI_U32 regAddress, tANI_U32 *pRegValue );
 
@@ -102,18 +102,18 @@ eHalStatus palReadRegister( tHddHandle hHdd, tANI_U32 regAddress, tANI_U32 *pReg
     \fn palWriteRegister
 
     \brief chip and bus agnostic funtion to write a register value
-    
+
     \param hHdd - HDD context handle
-    
+
     \param regAddress - address (offset) of the register to be read from the start
     of register space.
-    
+
     \param pRegValue - pointer to the value being written into the register
-    
-    \return eHalStatus - status of the register read.  Note that this function 
-    can fail.  In particular, when the card is removed, this function will return 
+
+    \return eHalStatus - status of the register read.  Note that this function
+    can fail.  In particular, when the card is removed, this function will return
     a failure.
-    
+
   -------------------------------------------------------------------------------*/
 eHalStatus palWriteRegister( tHddHandle hHdd, tANI_U32 regAddress, tANI_U32 regValue );
 
@@ -122,18 +122,18 @@ eHalStatus palWriteRegister( tHddHandle hHdd, tANI_U32 regAddress, tANI_U32 regV
     \fn palAsyncWriteRegister
 
     \brief chip and bus agnostic async funtion to write a register value
-    
+
     \param hHdd - HDD context handle
-    
+
     \param regAddress - address (offset) of the register to be written from the start
     of register space.
-    
+
     \param regValue - value being written into the register
-    
-    \return eHalStatus - status of the register write.  Note that this function 
-    can fail.  In particular, when the card is removed, this function will return 
+
+    \return eHalStatus - status of the register write.  Note that this function
+    can fail.  In particular, when the card is removed, this function will return
     a failure.
-    
+
   -------------------------------------------------------------------------------*/
 
 eHalStatus palAsyncWriteRegister( tHddHandle hHdd, tANI_U32 regAddress, tANI_U32 regValue );
@@ -144,21 +144,21 @@ eHalStatus palAsyncWriteRegister( tHddHandle hHdd, tANI_U32 regAddress, tANI_U32
     \fn palReadDeviceMemory
 
     \brief chip and bus agnostic funtion to read memory from the chip
-    
+
     \param hHdd - HDD context handle
-    
-    \param memOffset - address (offset) of the memory from the top of the 
+
+    \param memOffset - address (offset) of the memory from the top of the
     memory map (as exposed to the host) where the memory will be read from.
-    
+
     \param pBuffer - pointer to a buffer where the memory will be placed in host
     memory space after retreived from the chip.
-    
+
     \param numBytes - the number of bytes to be read.
-    
-    \return eHalStatus - status of the memory read.  Note that this function 
-    can fail.  In particular, when the card is removed, this function will return 
+
+    \return eHalStatus - status of the memory read.  Note that this function
+    can fail.  In particular, when the card is removed, this function will return
     a failure.
-    
+
   -------------------------------------------------------------------------------*/
 eHalStatus palReadDeviceMemory( tHddHandle hHdd, tANI_U32 memOffset, tANI_U8 *pBuffer, tANI_U32 numBytes );
 
@@ -167,47 +167,47 @@ eHalStatus palReadDeviceMemory( tHddHandle hHdd, tANI_U32 memOffset, tANI_U8 *pB
     \fn palWriteDeviceMemory
 
     \brief chip and bus agnostic funtion to write memory to the chip
-    
+
     \param hHdd - HDD context handle
-    
-    \param memOffset - address (offset) of the memory from the top of the on-chip 
+
+    \param memOffset - address (offset) of the memory from the top of the on-chip
     memory that will be written.
-    
-    \param pBuffer - pointer to a buffer that has the source data that will be 
+
+    \param pBuffer - pointer to a buffer that has the source data that will be
     written to the chip.
-    
+
     \param numBytes - the number of bytes to be written.
-    
-    \return eHalStatus - status of the memory read.  Note that this function 
-    can fail.  In particular, when the card is removed, this function will return 
+
+    \return eHalStatus - status of the memory read.  Note that this function
+    can fail.  In particular, when the card is removed, this function will return
     a failure.
-    
+
   -------------------------------------------------------------------------------*/
-eHalStatus palWriteDeviceMemory( tHddHandle hHdd, tANI_U32 memOffset, tANI_U8 *pBuffer, tANI_U32 numBytes );  
+eHalStatus palWriteDeviceMemory( tHddHandle hHdd, tANI_U32 memOffset, tANI_U8 *pBuffer, tANI_U32 numBytes );
 
 
 /** ---------------------------------------------------------------------------
 
     \fn palAllocateMemory
 
-    \brief OS agnostic funtion to allocate host memory.   
-    
-    \note  Host memory that needs to be shared between the host and the 
+    \brief OS agnostic funtion to allocate host memory.
+
+    \note  Host memory that needs to be shared between the host and the
     device needs to be allocated with the palAllocateSharedMemory()
     and free'd with palFreeSharedMemory() functions.
-        
+
     \param hHdd - HDD context handle
-    
-    \param ppMemory - pointer to a void pointer where the address of the 
+
+    \param ppMemory - pointer to a void pointer where the address of the
     memory allocated will be placed upon return from this function.
-    
+
     \param numBytes - the number of bytes to allocate.
-    
-    \return eHalStatus - status of the register read.  Note that this function 
-    can fail.  In the case of a failure, a non-successful return code will be 
+
+    \return eHalStatus - status of the register read.  Note that this function
+    can fail.  In the case of a failure, a non-successful return code will be
     returned and no memory will be allocated (the *ppMemory will be NULL so don't
     try to use it unless the status returns success).
-    
+
   -------------------------------------------------------------------------------*/
 #ifndef FEATURE_WLAN_PAL_MEM_DISABLE
 
@@ -223,22 +223,22 @@ eHalStatus palAllocateMemory( tHddHandle hHdd, void **ppMemory, tANI_U32 numByte
 
     \fn palFreeMemory
 
-    \brief OS agnostic funtion to free host memory that was allocated with 
+    \brief OS agnostic funtion to free host memory that was allocated with
     palAllcoateMemory() calls.
-    
-    \note  Host memory that needs to be shared between the host and the 
+
+    \note  Host memory that needs to be shared between the host and the
     device needs to be allocated with the palAllocateSharedMemory()
     and free'd with palFreeSharedMemory() functions.
-        
+
     \param hHdd - HDD context handle
-    
+
     \param pMemory - pointer to memory that will be free'd.
-    
-    \return eHalStatus - status of the register read.  Note that this function 
-    can fail.  In the case of a failure, a non-successful return code will be 
+
+    \return eHalStatus - status of the register read.  Note that this function
+    can fail.  In the case of a failure, a non-successful return code will be
     returned and no memory will be allocated (the *ppMemory will be NULL so don't
     try to use it unless the status returns success).
-    
+
   -------------------------------------------------------------------------------*/
 eHalStatus palFreeMemory( tHddHandle hHdd, void *pMemory );
 
@@ -249,20 +249,20 @@ eHalStatus palFreeMemory( tHddHandle hHdd, void *pMemory );
     \fn palFillMemory
 
     \brief OS agnostic funtion to fill host memory with a specified byte value
-    
+
     \param hHdd - HDD context handle
-    
+
     \param pMemory - pointer to memory that will be filled.
-    
+
     \param numBytes - the number of bytes to be filled.
-    
+
     \param fillValue - the byte to be written to fill the memory with.
-    
-    \return eHalStatus - status of the register read.  Note that this function 
-    can fail.  In the case of a failure, a non-successful return code will be 
+
+    \return eHalStatus - status of the register read.  Note that this function
+    can fail.  In the case of a failure, a non-successful return code will be
     returned and no memory will be allocated (the *ppMemory will be NULL so don't
     try to use it unless the status returns success).
-    
+
   -------------------------------------------------------------------------------*/
 eHalStatus palFillMemory( tHddHandle hHdd, void *pMemory, tANI_U32 numBytes, tANI_BYTE fillValue );
 
@@ -271,17 +271,17 @@ eHalStatus palFillMemory( tHddHandle hHdd, void *pMemory, tANI_U32 numBytes, tAN
     \fn palCopyMemory
 
     \brief OS agnostic funtion to copy host memory from one location to another
-    
+
     \param hHdd - HDD context handle
-    
+
     \param pSrc - pointer to source memory location (to copy from)
 
     \param pSrc - pointer to destination memory location (to copy to)
-    
+
     \param numBytes - the number of bytes to be be copied.
-    
-    \return eHalStatus - status of the memory copy 
-    
+
+    \return eHalStatus - status of the memory copy
+
   -------------------------------------------------------------------------------*/
 eHalStatus palCopyMemory( tHddHandle hHdd, void *pDst, const void *pSrc, tANI_U32 numBytes );
 
@@ -290,46 +290,46 @@ eHalStatus palCopyMemory( tHddHandle hHdd, void *pDst, const void *pSrc, tANI_U3
     \fn palFillMemory
 
     \brief OS agnostic funtion to fill host memory with a specified byte value
-    
+
     \param hHdd - HDD context handle
-    
+
     \param pMemory - pointer to memory that will be filled.
-    
+
     \param numBytes - the number of bytes to be filled.
-    
+
     \param fillValue - the byte to be written to fill the memory with.
-    
-    \return eHalStatus - status of the register read.  Note that this function 
-    can fail.  In the case of a failure, a non-successful return code will be 
+
+    \return eHalStatus - status of the register read.  Note that this function
+    can fail.  In the case of a failure, a non-successful return code will be
     returned and no memory will be allocated (the *ppMemory will be NULL so don't
     try to use it unless the status returns success).
-    
+
   -------------------------------------------------------------------------------*/
 ANI_INLINE_FUNCTION
 eHalStatus palZeroMemory( tHddHandle hHdd, void *pMemory, tANI_U32 numBytes )
 {
     return( palFillMemory( hHdd, pMemory, numBytes, 0 ) );
-} 
+}
 
 
 /** ---------------------------------------------------------------------------
 
     \fn palEqualMemory
 
-    \brief OS agnostic funtion to compare two pieces of memory, similar to 
+    \brief OS agnostic funtion to compare two pieces of memory, similar to
     memcmp function in standard C.
-        
+
     \param hHdd - HDD context handle
-    
+
     \param pMemory1 - pointer to one location in memory to compare.
 
     \param pMemory2 - pointer to second location in memory to compare.
-    
+
     \param numBytes - the number of bytes to compare.
-    
+
     \return tANI_BOOLEAN - returns a boolean value that tells if the memory
-    locations are equal or now equal. 
-    
+    locations are equal or now equal.
+
   -------------------------------------------------------------------------------*/
 tANI_BOOLEAN palEqualMemory( tHddHandle hHdd, void *pMemory1, void *pMemory2, tANI_U32 numBytes );
 #endif
@@ -337,29 +337,29 @@ tANI_BOOLEAN palEqualMemory( tHddHandle hHdd, void *pMemory1, void *pMemory2, tA
 
     \fn palFillDeviceMemory
 
-    \brief OS agnostic funtion to fill device memory with a specified 
+    \brief OS agnostic funtion to fill device memory with a specified
     32bit value
-    
+
     \param hHdd - HDD context handle
-    
+
     \param memOffset - offset of the memory on the device to fill.
-    
+
     \param numBytes - the number of bytes to be filled.
-    
+
     \param fillValue - the byte pattern to fill into memory on the device
-    
-    \return eHalStatus - status of the register read.  Note that this function 
-    can fail. 
-    
-    eHAL_STATUS_DEVICE_MEMORY_LENGTH_ERROR - length of the device memory is not 
+
+    \return eHalStatus - status of the register read.  Note that this function
+    can fail.
+
+    eHAL_STATUS_DEVICE_MEMORY_LENGTH_ERROR - length of the device memory is not
     a multiple of 4 bytes.
-    
-    eHAL_STATUS_DEVICE_MEMORY_MISALIGNED - memory address is not aligned on a 
+
+    eHAL_STATUS_DEVICE_MEMORY_MISALIGNED - memory address is not aligned on a
     4 byte boundary.
-    
-    \note return failure if the memOffset is not 32bit aligned and not a 
+
+    \note return failure if the memOffset is not 32bit aligned and not a
     multiple of 4 bytes (the device does not support anything else).
-    
+
   -------------------------------------------------------------------------------*/
 eHalStatus palFillDeviceMemory( tHddHandle hHdd, tANI_U32 memOffset, tANI_U32 numBytes, tANI_BYTE fillValue );
 
@@ -369,49 +369,49 @@ eHalStatus palFillDeviceMemory( tHddHandle hHdd, tANI_U32 memOffset, tANI_U32 nu
     \fn palZeroDeviceMemory
 
     \brief OS agnostic funtion to fill device memory with a specified byte value
-    
+
     \param hHdd - HDD context handle
-    
+
     \param memOffset - offset of the memory on the device to fill.
-    
+
     \param numBytes - the number of bytes to be filled.
-    
+
     \param fillValue - the 32bit pattern to fill the memory with.
-    
-    \return eHalStatus - status of the register read.  Note that this function 
-    can fail. 
-    
-    eHAL_STATUS_DEVICE_MEMORY_LENGTH_ERROR - length of the device memory is not 
+
+    \return eHalStatus - status of the register read.  Note that this function
+    can fail.
+
+    eHAL_STATUS_DEVICE_MEMORY_LENGTH_ERROR - length of the device memory is not
     a multiple of 4 bytes.
-    
-    eHAL_STATUS_DEVICE_MEMORY_MISALIGNED - memory address is not aligned on a 
+
+    eHAL_STATUS_DEVICE_MEMORY_MISALIGNED - memory address is not aligned on a
     4 byte boundary.
-    
-    \note return failure if the memOffset is not 32bit aligned and not a 
+
+    \note return failure if the memOffset is not 32bit aligned and not a
     multiple of 4 bytes (the device does not support anything else).
-    
+
   -------------------------------------------------------------------------------*/
 ANI_INLINE_FUNCTION
 eHalStatus palZeroDeviceMemory( tHddHandle hHdd, tANI_U32 memOffset, tANI_U32 numBytes )
 {
     return( palFillDeviceMemory( hHdd, memOffset, numBytes, 0 ) );
-} 
+}
 
 /*----------------------------------------------------------------------------------
 
     Allocate a packet for sending through the Tx APIs.
 
     \param hHdd - HDD context handle
-    
+
     \param frmType - Frame type
-    
+
     \param size
 
     \param data -
 
-    \param ppPacket  - 
+    \param ppPacket  -
 
-    \return eHalStatus -     
+    \return eHalStatus -
 ----------------------------------------------------------------------------------*/
 eHalStatus palPktAlloc(tHddHandle hHdd, eFrameType frmType, tANI_U16 size, void **data, void **ppPacket) ;
 
@@ -433,7 +433,7 @@ eHalStatus palSpinLockGive( tHddHandle hHdd, tPalSpinLockHandle hSpinLock );
 //PAL lock functions end
 
 
-//This function send a message to MAC, 
+//This function send a message to MAC,
 //pMsgBuf is a buffer allocated by caller. The actual structure varies base on message type
 //The beginning of the buffer can always map to tSirMbMsg
 //This function must take care of padding if it is required for the OS
@@ -447,8 +447,8 @@ extern void palGetUnicastStats(tHddHandle hHdd, tANI_U32 *tx, tANI_U32 *rx);
     time difference.
 
     \param hHdd - HDD context handle
-    
-    \return tick count. 
+
+    \return tick count.
 ----------------------------------------------------------------------------------*/
 tANI_U32 palGetTickCount(tHddHandle hHdd);
 
@@ -458,21 +458,21 @@ tANI_U32 palGetTickCount(tHddHandle hHdd);
 
     \brief chip and bus agnostic function to read memory from the PHY register space as memory
     i.e. to read more than 4 bytes from the contiguous register space
-    
+
     \param hHdd - HDD context handle
-    
-    \param memOffset - address (offset) of the memory from the top of the 
+
+    \param memOffset - address (offset) of the memory from the top of the
     memory map (as exposed to the host) where the memory will be read from.
-    
+
     \param pBuffer - pointer to a buffer where the memory will be placed in host
     memory space after retreived from the chip.
-    
+
     \param numBytes - the number of bytes to be read.
-    
-    \return eHalStatus - status of the memory read.  Note that this function 
-    can fail.  In particular, when the card is removed, this function will return 
+
+    \return eHalStatus - status of the memory read.  Note that this function
+    can fail.  In particular, when the card is removed, this function will return
     a failure.
-    
+
   -------------------------------------------------------------------------------*/
 eHalStatus palReadRegMemory( tHddHandle hHdd, tANI_U32 memOffset, tANI_U8 *pBuffer, tANI_U32 numBytes );
 
@@ -485,19 +485,19 @@ eHalStatus palReadRegMemory( tHddHandle hHdd, tANI_U32 memOffset, tANI_U8 *pBuff
     API does the write asynchronously.
 
     \param hHdd - HDD context handle
-    
-    \param memOffset - address (offset) of the memory from the top of the on-chip 
+
+    \param memOffset - address (offset) of the memory from the top of the on-chip
     memory that will be written.
-    
-    \param pBuffer - pointer to a buffer that has the source data that will be 
+
+    \param pBuffer - pointer to a buffer that has the source data that will be
     written to the chip.
-    
+
     \param numBytes - the number of bytes to be written.
-    
-    \return eHalStatus - status of the memory read.  Note that this function 
-    can fail.  In particular, when the card is removed, this function will return 
+
+    \return eHalStatus - status of the memory read.  Note that this function
+    can fail.  In particular, when the card is removed, this function will return
     a failure.
-    
+
   -------------------------------------------------------------------------------*/
 eHalStatus palAsyncWriteRegMemory( tHddHandle hHdd, tANI_U32 memOffset, tANI_U8 *pBuffer, tANI_U32 numBytes );
 
@@ -506,23 +506,23 @@ eHalStatus palAsyncWriteRegMemory( tHddHandle hHdd, tANI_U32 memOffset, tANI_U8
     \fn palWriteRegMemory
     \brief chip and bus agnostic function to write memory to the PHY register space as memory
     i.e. to write more than 4 bytes from the contiguous register space. The difference from the
-    above routine is, in USB interface, this routine performs the write synchronously where as 
+    above routine is, in USB interface, this routine performs the write synchronously where as
     the above routine performs it asynchronously.
 
     \param hHdd - HDD context handle
-    
-    \param memOffset - address (offset) of the memory from the top of the on-chip 
+
+    \param memOffset - address (offset) of the memory from the top of the on-chip
     memory that will be written.
-    
-    \param pBuffer - pointer to a buffer that has the source data that will be 
+
+    \param pBuffer - pointer to a buffer that has the source data that will be
     written to the chip.
-    
+
     \param numBytes - the number of bytes to be written.
-    
-    \return eHalStatus - status of the memory read.  Note that this function 
-    can fail.  In particular, when the card is removed, this function will return 
+
+    \return eHalStatus - status of the memory read.  Note that this function
+    can fail.  In particular, when the card is removed, this function will return
     a failure.
-    
+
   -------------------------------------------------------------------------------*/
 eHalStatus palWriteRegMemory( tHddHandle hHdd, tANI_U32 memOffset, tANI_U8 *pBuffer, tANI_U32 numBytes );
 
@@ -531,15 +531,15 @@ eHalStatus palWriteRegMemory( tHddHandle hHdd, tANI_U32 memOffset, tANI_U8 *pBuf
 
     \fn palWaitRegVal
 
-    \brief is a blocking function which reads the register and waits for the given number of iterations 
+    \brief is a blocking function which reads the register and waits for the given number of iterations
     until the read value matches the waitRegVal. The delay between is perIterWaitInNanoSec(in nanoseconds)
-    
+
     \param hHdd - HDD context handle
-    
+
     \param reg - address of the register to be read
-    
+
     \param mask - mask to be applied for the read value
-    
+
     \param waitRegVal - expected value from the register after applying the mask.
 
     \param perIterWaitInNanoSec - delay between the two iterations in nanoseconds
@@ -547,14 +547,14 @@ eHalStatus palWriteRegMemory( tHddHandle hHdd, tANI_U32 memOffset, tANI_U8 *pBuf
     \param numIter - max number of reads before the timeout
 
     \param pReadRegVal - the value read from the register
-    
-    \return eHalStatus - status of the memory read.  Note that this function 
-    can fail.  In particular, when the card is removed, this function will return 
+
+    \return eHalStatus - status of the memory read.  Note that this function
+    can fail.  In particular, when the card is removed, this function will return
     a failure.
-    
+
   -------------------------------------------------------------------------------*/
-eHalStatus palWaitRegVal( tHddHandle hHdd, tANI_U32 reg, tANI_U32 mask, 
-                             tANI_U32 waitRegVal, tANI_U32 perIterWaitInNanoSec, 
+eHalStatus palWaitRegVal( tHddHandle hHdd, tANI_U32 reg, tANI_U32 mask,
+                             tANI_U32 waitRegVal, tANI_U32 perIterWaitInNanoSec,
                              tANI_U32 numIter, tANI_U32 *pReadRegVal );
 
 /** ---------------------------------------------------------------------------
@@ -565,17 +565,17 @@ eHalStatus palWaitRegVal( tHddHandle hHdd, tANI_U32 reg, tANI_U32 mask,
     and writes back the new value to the register
 
     \param hHdd - HDD context handle
-    
+
     \param reg - address of the register to be modified.
-    
+
     \param andMask - The value read will be ANDed with this mask
 
     \parma orMask - The value after applying the andMask will be ORed with this value
-    
-    \return eHalStatus - status of the memory read.  Note that this function 
-    can fail.  In particular, when the card is removed, this function will return 
+
+    \return eHalStatus - status of the memory read.  Note that this function
+    can fail.  In particular, when the card is removed, this function will return
     a failure.
-    
+
   -------------------------------------------------------------------------------*/
 eHalStatus palReadModifyWriteReg( tHddHandle hHdd, tANI_U32 reg, tANI_U32 andMask, tANI_U32 orMask );
 
@@ -602,7 +602,7 @@ tANI_U16 pal_cpu_to_be16(tANI_U16 x) ;
 #if defined( ANI_LITTLE_BYTE_ENDIAN )
 
 // Need to eliminate these and use the ani_cpu_to_le, etc. macros....
-ANI_INLINE_FUNCTION unsigned long i_htonl( unsigned long ul ) 
+ANI_INLINE_FUNCTION unsigned long i_htonl( unsigned long ul )
 {
   return( ( ( ul & 0x000000ff ) << 24 ) |
           ( ( ul & 0x0000ff00 ) <<  8 ) |
@@ -635,14 +635,14 @@ ANI_INLINE_FUNCTION unsigned long i_ntohl( unsigned long ul )
     \brief Assign 32-bit unsigned value to a byte array base on CPU's endianness.
 
     \note Caller must validate the byte array has enough space to hold the vlaue
-        
+
     \param ptr - Starting address of a byte array
-    
+
     \param value - The value to assign to the byte array
-    
-    \return - The address to the byte after the assignment. This may or may not 
+
+    \return - The address to the byte after the assignment. This may or may not
     be valid. Caller to verify.
-    
+
   -------------------------------------------------------------------------------*/
 ANI_INLINE_FUNCTION tANI_U8 * pal_set_U32(tANI_U8 *ptr, tANI_U32 value)
 {
@@ -669,14 +669,14 @@ ANI_INLINE_FUNCTION tANI_U8 * pal_set_U32(tANI_U8 *ptr, tANI_U32 value)
     \brief Assign 16-bit unsigned value to a byte array base on CPU's endianness.
 
     \note Caller must validate the byte array has enough space to hold the vlaue
-        
+
     \param ptr - Starting address of a byte array
-    
+
     \param value - The value to assign to the byte array
-    
-    \return - The address to the byte after the assignment. This may or may not 
+
+    \return - The address to the byte after the assignment. This may or may not
     be valid. Caller to verify.
-    
+
   -------------------------------------------------------------------------------*/
 ANI_INLINE_FUNCTION tANI_U8 * pal_set_U16(tANI_U8 *ptr, tANI_U16 value)
 {
@@ -699,15 +699,15 @@ ANI_INLINE_FUNCTION tANI_U8 * pal_set_U16(tANI_U8 *ptr, tANI_U16 value)
     \brief Retrieve a 16-bit unsigned value from a byte array base on CPU's endianness.
 
     \note Caller must validate the byte array has enough space to hold the vlaue
-        
+
     \param ptr - Starting address of a byte array
-    
-    \param pValue - Pointer to a caller allocated buffer for 16 bit value. Value is to assign 
+
+    \param pValue - Pointer to a caller allocated buffer for 16 bit value. Value is to assign
     to this location.
-    
-    \return - The address to the byte after the assignment. This may or may not 
+
+    \return - The address to the byte after the assignment. This may or may not
     be valid. Caller to verify.
-    
+
   -------------------------------------------------------------------------------*/
 ANI_INLINE_FUNCTION tANI_U8 * pal_get_U16(tANI_U8 *ptr, tANI_U16 *pValue)
 {
@@ -730,15 +730,15 @@ ANI_INLINE_FUNCTION tANI_U8 * pal_get_U16(tANI_U8 *ptr, tANI_U16 *pValue)
     \brief Retrieve a 32-bit unsigned value from a byte array base on CPU's endianness.
 
     \note Caller must validate the byte array has enough space to hold the vlaue
-        
+
     \param ptr - Starting address of a byte array
-    
-    \param pValue - Pointer to a caller allocated buffer for 32 bit value. Value is to assign 
+
+    \param pValue - Pointer to a caller allocated buffer for 32 bit value. Value is to assign
     to this location.
-    
-    \return - The address to the byte after the assignment. This may or may not 
+
+    \return - The address to the byte after the assignment. This may or may not
     be valid. Caller to verify.
-    
+
   -------------------------------------------------------------------------------*/
 ANI_INLINE_FUNCTION tANI_U8 * pal_get_U32(tANI_U8 *ptr, tANI_U32 *pValue)
 {
diff --git a/CORE/SYS/legacy/src/pal/inc/palTimer.h b/CORE/SYS/legacy/src/pal/inc/palTimer.h
index cadc1b99bcdd..eee07a894a0b 100644
--- a/CORE/SYS/legacy/src/pal/inc/palTimer.h
+++ b/CORE/SYS/legacy/src/pal/inc/palTimer.h
@@ -26,16 +26,16 @@
  */
 
 
-/** ------------------------------------------------------------------------- * 
-    ------------------------------------------------------------------------- *  
+/** ------------------------------------------------------------------------- *
+    ------------------------------------------------------------------------- *
+
 
-  
     \file palTimer.h
-  
+
     \brief Define data structure and ptototype for PAL timer.
-  
+
     $Id$... description...
-  
+
    ========================================================================== */
 
 #if !defined( PALTIMER_H__ )
@@ -44,7 +44,7 @@
 
 /*
 PAL TIMER
-  This timer can be used for every module in Windows side. 
+  This timer can be used for every module in Windows side.
   On Linus side, this can only be used by timer for HDD. Not for timers used in rtlib, hence it doesn't replace TX_TIMER
 */
 
@@ -65,8 +65,8 @@ typedef void (*palTimerCallback)(void *);
 #ifdef TIMER_MANAGER
 #define palTimerAlloc(hHdd, phPalTimer, pCallback, pContext) \
               palTimerAlloc_debug(hHdd, phPalTimer, pCallback, pContext, __FILE__, __LINE__)
-eHalStatus palTimerAlloc_debug( tHddHandle hHdd, tPalTimerHandle *phPalTimer, 
-                          palTimerCallback pCallback, void *pContext, char* fileName, v_U32_t lineNum  );              
+eHalStatus palTimerAlloc_debug( tHddHandle hHdd, tPalTimerHandle *phPalTimer,
+                          palTimerCallback pCallback, void *pContext, char* fileName, v_U32_t lineNum  );
 #else
 eHalStatus palTimerAlloc(tHddHandle hHdd, tPalTimerHandle *phPalTimer, palTimerCallback pCallback, void *pContext);
 #endif
@@ -78,8 +78,8 @@ eHalStatus palTimerFree(tHddHandle, tPalTimerHandle);
 //uExpireTime is set so that it is the new interval, in units of microseconds
 eHalStatus palTimerStart(tHddHandle, tPalTimerHandle, tANI_U32 uExpireTime, tANI_BOOLEAN fRestart);
 //palTimerStop will cancel the timer but doesn't guarrantee the callback will not called afterwards
-//For Windows, if the driver is halting, the callback is not called after this function returns. 
-eHalStatus palTimerStop(tHddHandle, tPalTimerHandle); 
+//For Windows, if the driver is halting, the callback is not called after this function returns.
+eHalStatus palTimerStop(tHddHandle, tPalTimerHandle);
 #endif
 
 #endif
diff --git a/CORE/SYS/legacy/src/pal/src/palApiComm.c b/CORE/SYS/legacy/src/pal/src/palApiComm.c
index 7ca9c46c839c..cce7c34aac95 100644
--- a/CORE/SYS/legacy/src/pal/src/palApiComm.c
+++ b/CORE/SYS/legacy/src/pal/src/palApiComm.c
@@ -41,28 +41,28 @@
 eHalStatus palAllocateMemory_debug( tHddHandle hHdd, void **ppMemory, tANI_U32 numBytes, char* fileName, tANI_U32 lineNum )
 {
    eHalStatus halStatus = eHAL_STATUS_SUCCESS;
-   
+
    *ppMemory = vos_mem_malloc_debug( numBytes, fileName, lineNum );
-   
-   if ( NULL == *ppMemory ) 
+
+   if ( NULL == *ppMemory )
    {
       halStatus = eHAL_STATUS_FAILURE;
    }
-   
+
    return( halStatus );
 }
 #else
 eHalStatus palAllocateMemory( tHddHandle hHdd, void **ppMemory, tANI_U32 numBytes )
 {
    eHalStatus halStatus = eHAL_STATUS_SUCCESS;
-   
+
    *ppMemory = vos_mem_malloc( numBytes );
-   
-   if ( NULL == *ppMemory ) 
+
+   if ( NULL == *ppMemory )
    {
       halStatus = eHAL_STATUS_FAILURE;
    }
-   
+
    return( halStatus );
 }
 #endif
@@ -71,14 +71,14 @@ eHalStatus palAllocateMemory( tHddHandle hHdd, void **ppMemory, tANI_U32 numByte
 eHalStatus palFreeMemory( tHddHandle hHdd, void *pMemory )
 {
    vos_mem_free( pMemory );
-   
+
    return( eHAL_STATUS_SUCCESS );
 }
 
 eHalStatus palFillMemory( tHddHandle hHdd, void *pMemory, tANI_U32 numBytes, tANI_BYTE fillValue )
 {
    vos_mem_set( pMemory, numBytes, fillValue );
-   
+
    return( eHAL_STATUS_SUCCESS );
 }
 
@@ -86,7 +86,7 @@ eHalStatus palFillMemory( tHddHandle hHdd, void *pMemory, tANI_U32 numBytes, tAN
 eHalStatus palCopyMemory( tHddHandle hHdd, void *pDst, const void *pSrc, tANI_U32 numBytes )
 {
    vos_mem_copy( pDst, pSrc, numBytes );
-   
+
    return( eHAL_STATUS_SUCCESS );
 }
 
@@ -95,7 +95,7 @@ eHalStatus palCopyMemory( tHddHandle hHdd, void *pDst, const void *pSrc, tANI_U3
 tANI_BOOLEAN palEqualMemory( tHddHandle hHdd, void *pMemory1, void *pMemory2, tANI_U32 numBytes )
 {
    return( vos_mem_compare( pMemory1, pMemory2, numBytes ) );
-}   
+}
 #endif
 
 #ifndef QCA_WIFI_2_0
@@ -103,39 +103,39 @@ eHalStatus palPktAlloc(tHddHandle hHdd, eFrameType frmType, tANI_U16 size, void
 {
    eHalStatus halStatus = eHAL_STATUS_FAILURE;
    VOS_STATUS vosStatus;
-   
+
    vos_pkt_t *pVosPacket;
-   
-   do 
+
+   do
    {
-      // we are only handling the 802_11_MGMT frame type for PE/LIM.  All other frame types should be 
+      // we are only handling the 802_11_MGMT frame type for PE/LIM.  All other frame types should be
       // ported to use the VOSS APIs directly and should not be using this palPktAlloc API.
       VOS_ASSERT( HAL_TXRX_FRM_802_11_MGMT == frmType );
-    
+
       if ( HAL_TXRX_FRM_802_11_MGMT != frmType ) break;
-   
+
       // allocate one 802_11_MGMT VOS packet, zero the packet and fail the call if nothing is available.
       // if we cannot get this vos packet, fail.
       vosStatus = vos_pkt_get_packet( &pVosPacket, VOS_PKT_TYPE_TX_802_11_MGMT, size, 1, VOS_TRUE, NULL, NULL );
       if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) ) break;
-      
+
       // Reserve the space at the head of the packet for the caller.  If we cannot reserve the space
       // then we have to fail (return the packet to voss first!)
       vosStatus = vos_pkt_reserve_head( pVosPacket, data, size );
-      if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) ) 
+      if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) )
       {
          vos_pkt_return_packet( pVosPacket );
          break;
       }
-      
+
       // Everything went well if we get here.  Return the packet pointer to the caller and indicate
       // success to the caller.
       *ppPacket = (void *)pVosPacket;
-      
+
       halStatus = eHAL_STATUS_SUCCESS;
-   
+
    } while( 0 );
-   
+
    return( halStatus );
 }
 #else
@@ -167,25 +167,25 @@ void palPktFree( tHddHandle hHdd, eFrameType frmType, void* buf, void *pPacket)
 {
    vos_pkt_t *pVosPacket = (vos_pkt_t *)pPacket;
    VOS_STATUS vosStatus;
-      
-   do 
+
+   do
    {
       VOS_ASSERT( pVosPacket );
-      
+
       if ( !pVosPacket ) break;
-      
-      // we are only handling the 802_11_MGMT frame type for PE/LIM.  All other frame types should be 
+
+      // we are only handling the 802_11_MGMT frame type for PE/LIM.  All other frame types should be
       // ported to use the VOSS APIs directly and should not be using this palPktAlloc API.
       VOS_ASSERT( HAL_TXRX_FRM_802_11_MGMT == frmType );
       if ( HAL_TXRX_FRM_802_11_MGMT != frmType ) break;
-      
-      // return the vos packet to Voss.  Nothing to do if this fails since the palPktFree does not 
+
+      // return the vos packet to Voss.  Nothing to do if this fails since the palPktFree does not
       // have a return code.
       vosStatus = vos_pkt_return_packet( pVosPacket );
       VOS_ASSERT( VOS_IS_STATUS_SUCCESS( vosStatus ) );
-      
+
    } while( 0 );
-   
+
    return;
 }
 #else
@@ -209,17 +209,17 @@ tANI_U32 pal_be32_to_cpu(tANI_U32 x)
 tANI_U32 pal_cpu_to_be32(tANI_U32 x)
 {
    return(( x ) );
-}   
+}
 
 tANI_U16 pal_be16_to_cpu(tANI_U16 x)
 {
    return( ( x ) );
-}   
-   
+}
+
 tANI_U16 pal_cpu_to_be16(tANI_U16 x)
 {
    return( ( x ) );
-}   
+}
 
 
 
@@ -228,26 +228,26 @@ eHalStatus palSpinLockAlloc( tHddHandle hHdd, tPalSpinLockHandle *pHandle )
    eHalStatus halStatus = eHAL_STATUS_FAILURE;
    VOS_STATUS vosStatus;
    vos_lock_t *pLock;
-   
+
    do
    {
       pLock = vos_mem_malloc( sizeof( vos_lock_t ) );
-   
+
       if ( NULL == pLock ) break;
-      
+
       vosStatus = vos_lock_init( pLock );
       if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) )
       {
          vos_mem_free( pLock );
          break;
       }
-      
+
       *pHandle = (tPalSpinLockHandle)pLock;
       halStatus = eHAL_STATUS_SUCCESS;
-      
+
    } while( 0 );
-   
-   return( halStatus );   
+
+   return( halStatus );
 }
 
 
@@ -256,14 +256,14 @@ eHalStatus palSpinLockFree( tHddHandle hHdd, tPalSpinLockHandle hSpinLock )
    eHalStatus halStatus = eHAL_STATUS_FAILURE;
    vos_lock_t *pLock = (vos_lock_t *)hSpinLock;
    VOS_STATUS vosStatus;
-   
+
    vosStatus = vos_lock_destroy( pLock );
    if ( VOS_IS_STATUS_SUCCESS( vosStatus ) )
    {
       // if we successfully destroy the lock, free
       // the memory and indicate success to the caller.
       vos_mem_free( pLock );
-      
+
       halStatus = eHAL_STATUS_SUCCESS;
    }
    return( halStatus );
@@ -275,7 +275,7 @@ eHalStatus palSpinLockTake( tHddHandle hHdd, tPalSpinLockHandle hSpinLock )
    eHalStatus halStatus = eHAL_STATUS_FAILURE;
    vos_lock_t *pLock = (vos_lock_t *)hSpinLock;
    VOS_STATUS vosStatus;
-   
+
    vosStatus = vos_lock_acquire( pLock );
    if ( VOS_IS_STATUS_SUCCESS( vosStatus ) )
    {
@@ -283,10 +283,10 @@ eHalStatus palSpinLockTake( tHddHandle hHdd, tPalSpinLockHandle hSpinLock )
       // to the caller.
       halStatus = eHAL_STATUS_SUCCESS;
    }
-   
+
    return( halStatus );
-}   
-   
+}
+
 
 
 
@@ -296,7 +296,7 @@ eHalStatus palSpinLockGive( tHddHandle hHdd, tPalSpinLockHandle hSpinLock )
    eHalStatus halStatus = eHAL_STATUS_FAILURE;
    vos_lock_t *pLock = (vos_lock_t *)hSpinLock;
    VOS_STATUS vosStatus;
-   
+
    vosStatus = vos_lock_release( pLock );
    if ( VOS_IS_STATUS_SUCCESS( vosStatus ) )
    {
@@ -306,7 +306,7 @@ eHalStatus palSpinLockGive( tHddHandle hHdd, tPalSpinLockHandle hSpinLock )
    }
 
    return( halStatus );
-} 
+}
 
 
 // Caller of this function MUST dynamically allocate memory for pBuf
@@ -346,7 +346,7 @@ eHalStatus palSendMBMessage(tHddHandle hHdd, void *pBuf)
 
    return( halStatus );
 }
-  
+
 
 
 //All semophore functions are no-op here
@@ -389,7 +389,7 @@ eHalStatus palSemaphoreGive( tHddHandle hHdd, tPalSemaphoreHandle hSemaphore )
     return (eHAL_STATUS_SUCCESS);
 }
 
-eHalStatus palMutexAlloc( tHddHandle hHdd, tPalSemaphoreHandle *pHandle) 
+eHalStatus palMutexAlloc( tHddHandle hHdd, tPalSemaphoreHandle *pHandle)
 {
     (void)hHdd;
     (void)pHandle;
@@ -426,4 +426,3 @@ void pal_local_bh_disable(void)
 void pal_local_bh_enable(void)
 {
 }
-
diff --git a/CORE/SYS/legacy/src/pal/src/palTimer.c b/CORE/SYS/legacy/src/pal/src/palTimer.c
index 94e04e19ee18..41ab2d862a0f 100644
--- a/CORE/SYS/legacy/src/pal/src/palTimer.c
+++ b/CORE/SYS/legacy/src/pal/src/palTimer.c
@@ -43,28 +43,28 @@
 
 #ifndef FEATURE_WLAN_PAL_TIMER_DISABLE
 typedef struct sPalTimer
-{   
+{
     palTimerCallback timerCallback;
     void *pContext;
-    tHddHandle hHdd;         // not really needed when mapping to vos timers   
+    tHddHandle hHdd;         // not really needed when mapping to vos timers
     tANI_U32 uTimerInterval; //meaningful only is fRestart is true
     tANI_BOOLEAN fRestart;
-    
+
     vos_timer_t vosTimer;
-    
+
 } tPalTimer, *tpPalTimer;
 
 v_VOID_t internalTimerCallback( v_PVOID_t userData )
 {
     tPalTimer *pPalTimer = (tPalTimer *)userData;
-    
+
     if ( pPalTimer )
     {
         if ( pPalTimer->timerCallback )
         {
             pPalTimer->timerCallback( pPalTimer->pContext );
         }
-        
+
         if ( pPalTimer->fRestart )
         {
             palTimerStart( pPalTimer->hHdd, pPalTimer, pPalTimer->uTimerInterval, eANI_BOOLEAN_TRUE );
@@ -73,21 +73,21 @@ v_VOID_t internalTimerCallback( v_PVOID_t userData )
 }
 
 #ifdef TIMER_MANAGER
-eHalStatus palTimerAlloc_debug( tHddHandle hHdd, tPalTimerHandle *phPalTimer, 
+eHalStatus palTimerAlloc_debug( tHddHandle hHdd, tPalTimerHandle *phPalTimer,
                           palTimerCallback pCallback, void *pContext, char* fileName, v_U32_t lineNum  )
 {
    eHalStatus halStatus = eHAL_STATUS_FAILURE;
    tPalTimer *pPalTimer = NULL;
    VOS_STATUS vosStatus;
-    
+
    do
    {
       // allocate the internal timer structure.
       pPalTimer = vos_mem_malloc( sizeof( tPalTimer ) );
       if ( NULL == pPalTimer ) break;
-       
+
       // initialize the vos Timer that underlies the pal Timer.
-      vosStatus = vos_timer_init_debug( &pPalTimer->vosTimer, VOS_TIMER_TYPE_SW, 
+      vosStatus = vos_timer_init_debug( &pPalTimer->vosTimer, VOS_TIMER_TYPE_SW,
                                    internalTimerCallback, pPalTimer, fileName, lineNum );
       if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) )
       {
@@ -95,37 +95,37 @@ eHalStatus palTimerAlloc_debug( tHddHandle hHdd, tPalTimerHandle *phPalTimer,
          vos_mem_free( pPalTimer );
          break;
       }
-      
-      // initialize the info in the internal palTimer struct so we can 
+
+      // initialize the info in the internal palTimer struct so we can
       pPalTimer->timerCallback = pCallback;
       pPalTimer->pContext      = pContext;
       pPalTimer->hHdd          = hHdd;
-      
+
       // return a 'handle' to the caller.
       *phPalTimer = pPalTimer;
-      
+
       halStatus = eHAL_STATUS_SUCCESS;
-      
-   } while( 0 );   
-       
+
+   } while( 0 );
+
     return( halStatus );
 }
 #else
-eHalStatus palTimerAlloc( tHddHandle hHdd, tPalTimerHandle *phPalTimer, 
+eHalStatus palTimerAlloc( tHddHandle hHdd, tPalTimerHandle *phPalTimer,
                           palTimerCallback pCallback, void *pContext )
 {
    eHalStatus halStatus = eHAL_STATUS_FAILURE;
    tPalTimer *pPalTimer = NULL;
    VOS_STATUS vosStatus;
-    
+
    do
    {
       // allocate the internal timer structure.
       pPalTimer = vos_mem_malloc( sizeof( tPalTimer ) );
       if ( NULL == pPalTimer ) break;
-       
+
       // initialize the vos Timer that underlies the pal Timer.
-      vosStatus = vos_timer_init( &pPalTimer->vosTimer, VOS_TIMER_TYPE_SW, 
+      vosStatus = vos_timer_init( &pPalTimer->vosTimer, VOS_TIMER_TYPE_SW,
                                    internalTimerCallback, pPalTimer );
       if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) )
       {
@@ -133,19 +133,19 @@ eHalStatus palTimerAlloc( tHddHandle hHdd, tPalTimerHandle *phPalTimer,
          vos_mem_free( pPalTimer );
          break;
       }
-      
-      // initialize the info in the internal palTimer struct so we can 
+
+      // initialize the info in the internal palTimer struct so we can
       pPalTimer->timerCallback = pCallback;
       pPalTimer->pContext      = pContext;
       pPalTimer->hHdd          = hHdd;
-      
+
       // return a 'handle' to the caller.
       *phPalTimer = pPalTimer;
-      
+
       halStatus = eHAL_STATUS_SUCCESS;
-      
-   } while( 0 );   
-       
+
+   } while( 0 );
+
     return( halStatus );
 }
 #endif
@@ -156,22 +156,22 @@ eHalStatus palTimerFree( tHddHandle hHdd, tPalTimerHandle hPalTimer )
    eHalStatus status = eHAL_STATUS_INVALID_PARAMETER;
    VOS_STATUS vosStatus;
    tPalTimer *pPalTimer = (tPalTimer *)hPalTimer;
-    
+
    do
    {
       if ( NULL == pPalTimer ) break;
-   
-      // Destroy the vos timer...      
+
+      // Destroy the vos timer...
       vosStatus = vos_timer_destroy( &pPalTimer->vosTimer );
       if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) ) break;
-      
+
       // Free the memory for the intrnal timer struct...
       vos_mem_free( pPalTimer );
-      
+
       status = eHAL_STATUS_SUCCESS;
-      
+
    } while( 0 );
-    
+
    return( status );
 }
 
@@ -181,32 +181,32 @@ eHalStatus palTimerStart(tHddHandle hHdd, tPalTimerHandle hPalTimer, tANI_U32 uE
    eHalStatus status = eHAL_STATUS_INVALID_PARAMETER;
    VOS_STATUS vosStatus;
    tANI_U32 expireTimeInMS = 0;
-   
+
    tPalTimer *pPalTimer = (tPalTimer *)hPalTimer;
-    
-   do 
+
+   do
    {
       if ( NULL == pPalTimer ) break;
-       
+
       pPalTimer->fRestart = fRestart;
       pPalTimer->uTimerInterval = uExpireTime;
-      
-      // vos Timer takes expiration time in milliseconds.  palTimerStart and 
+
+      // vos Timer takes expiration time in milliseconds.  palTimerStart and
       // the uTimerIntervl in tPalTimer struct have expiration tiem in
       // microseconds.  Make and adjustment from microseconds to milliseconds
       // before calling the vos_timer_start().
       expireTimeInMS = uExpireTime / 1000;
       vosStatus = vos_timer_start( &pPalTimer->vosTimer, expireTimeInMS );
-      if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) ) 
+      if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) )
       {
          status = eHAL_STATUS_FAILURE;
          break;
       }
-      
-      status = eHAL_STATUS_SUCCESS;   
-      
+
+      status = eHAL_STATUS_SUCCESS;
+
    } while( 0 );
-    
+
    return( status );
 }
 
@@ -214,27 +214,23 @@ eHalStatus palTimerStart(tHddHandle hHdd, tPalTimerHandle hPalTimer, tANI_U32 uE
 eHalStatus palTimerStop(tHddHandle hHdd, tPalTimerHandle hPalTimer)
 {
    eHalStatus status = eHAL_STATUS_INVALID_PARAMETER;
-   
+
    tPalTimer *pPalTimer = (tPalTimer *)hPalTimer;
-    
-   do 
+
+   do
    {
       if ( NULL == pPalTimer ) break;
 
       vos_timer_stop( &pPalTimer->vosTimer );
-     
+
       // make sure the timer is not re-started.
       pPalTimer->fRestart = eANI_BOOLEAN_FALSE;
 
       status = eHAL_STATUS_SUCCESS;
 
-   } while( 0 );   
-   
+   } while( 0 );
+
    return( status );
-}   
+}
 
 #endif
-
-
-
-
diff --git a/CORE/SYS/legacy/src/platform/inc/VossWrapper.h b/CORE/SYS/legacy/src/platform/inc/VossWrapper.h
index 69199f6c795f..25f4c54e1818 100644
--- a/CORE/SYS/legacy/src/platform/inc/VossWrapper.h
+++ b/CORE/SYS/legacy/src/platform/inc/VossWrapper.h
@@ -173,6 +173,3 @@ extern v_BOOL_t  tx_timer_running(TX_TIMER*);
 
 
 #endif
-
-
-
diff --git a/CORE/SYS/legacy/src/platform/src/VossWrapper.c b/CORE/SYS/legacy/src/platform/src/VossWrapper.c
index c37e2728f644..57c01ab33cfc 100644
--- a/CORE/SYS/legacy/src/platform/src/VossWrapper.c
+++ b/CORE/SYS/legacy/src/platform/src/VossWrapper.c
@@ -28,23 +28,23 @@
 /*===========================================================================
   @file VossWrapper.c
 
-  @brief This source file contains the various function definitions for the 
+  @brief This source file contains the various function definitions for the
   RTOS abstraction layer, implemented for VOSS
 ===========================================================================*/
 
-/*=========================================================================== 
-    
-                       EDIT HISTORY FOR FILE 
-   
-   
-  This section contains comments describing changes made to the module.    
-  Notice that changes are listed in reverse chronological order. 
-   
-   
-  $Header:$ $DateTime: $ $Author: $ 
-   
-   
-  when        who    what, where, why 
+/*===========================================================================
+
+                       EDIT HISTORY FOR FILE
+
+
+  This section contains comments describing changes made to the module.
+  Notice that changes are listed in reverse chronological order.
+
+
+  $Header:$ $DateTime: $ $Author: $
+
+
+  when        who    what, where, why
   --------    ---    --------------------------------------------------------
   03/31/09    sho    Remove the use of vosTimerIsActive flag as it is not
                      thread-safe
@@ -57,11 +57,11 @@
   11/20/08    sho    Renamed this to VosWrapper.c; remove all dependencies on
                      WM platform and allow this to work on all VOSS enabled
                      platform
-  06/24/08    tbh    Modified the file to remove the dependecy on HDD files as 
-                     part of Gen6 bring up process. 
-  10/29/02 Neelay Das Created file. 
-     
-===========================================================================*/ 
+  06/24/08    tbh    Modified the file to remove the dependecy on HDD files as
+                     part of Gen6 bring up process.
+  10/29/02 Neelay Das Created file.
+
+===========================================================================*/
 
 /*---------------------------------------------------------------------------
  * Include Files
@@ -75,7 +75,7 @@
 #endif
 
 /**---------------------------------------------------------------------
- * tx_time_get() 
+ * tx_time_get()
  *
  * FUNCTION:
  *
@@ -85,11 +85,11 @@
  *
  * NOTE:
  *
- * @param  
+ * @param
  *
  * @return current system time in units of miliseconds
  *
- */ 
+ */
 v_ULONG_t tx_time_get( void )
 {
    return(vos_timer_get_system_ticks());
@@ -98,7 +98,7 @@ v_ULONG_t tx_time_get( void )
 
 
 /**---------------------------------------------------------------------
- * tx_timer_activate() 
+ * tx_timer_activate()
  *
  * FUNCTION:
  *
@@ -108,7 +108,7 @@ v_ULONG_t tx_time_get( void )
  *
  * NOTE:
  *
- * @param  
+ * @param
  *
  * @return TX_SUCCESS.
  *
@@ -116,7 +116,7 @@ v_ULONG_t tx_time_get( void )
 v_UINT_t tx_timer_activate(TX_TIMER *timer_ptr)
 {
    VOS_STATUS status;
-  
+
     // Uncomment the asserts, if the intention is to debug the occurence of the
     // following anomalous cnditions.
 
@@ -140,28 +140,28 @@ v_UINT_t tx_timer_activate(TX_TIMER *timer_ptr)
     // Check for an uninitialized timer
     VOS_ASSERT(0 != strlen(TIMER_NAME));
 
-    VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO, 
+    VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO,
             "Timer %s being activated\n", TIMER_NAME);
 
-    status = vos_timer_start( &timer_ptr->vosTimer, 
+    status = vos_timer_start( &timer_ptr->vosTimer,
          timer_ptr->initScheduleTimeInMsecs );
 
    if (VOS_STATUS_SUCCESS == status)
    {
-      VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO, 
+      VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO,
             "Timer %s now activated\n", TIMER_NAME);
       return TX_SUCCESS;
    }
    else if (VOS_STATUS_E_ALREADY == status)
    {
       // starting timer fails because timer is already started; this is okay
-      VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO, 
+      VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO,
             "Timer %s is already running\n", TIMER_NAME);
       return TX_SUCCESS;
    }
    else
    {
-      VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_ERROR, 
+      VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_ERROR,
             "Timer %s fails to activate\n", TIMER_NAME);
       return TX_TIMER_ERROR;
    }
@@ -169,7 +169,7 @@ v_UINT_t tx_timer_activate(TX_TIMER *timer_ptr)
 
 
 /**---------------------------------------------------------------------
- * tx_timer_change() 
+ * tx_timer_change()
  *
  * FUNCTION:
  *
@@ -179,19 +179,19 @@ v_UINT_t tx_timer_activate(TX_TIMER *timer_ptr)
  *
  * NOTE:
  *
- * @param  
+ * @param
  *
  * @return TX_SUCCESS.
  *
  */
-v_UINT_t tx_timer_change(TX_TIMER *timer_ptr, 
+v_UINT_t tx_timer_change(TX_TIMER *timer_ptr,
       v_ULONG_t initScheduleTimeInTicks, v_ULONG_t rescheduleTimeInTicks)
 {
    // Put a check for the free builds
    if (TX_AIRGO_TMR_SIGNATURE != timer_ptr->tmrSignature) {
        VOS_ASSERT( timer_ptr->tmrSignature == 0 );
 
-       return TX_TIMER_ERROR;      
+       return TX_TIMER_ERROR;
    }
 
     // changes cannot be applied until timer stops running
@@ -208,7 +208,7 @@ v_UINT_t tx_timer_change(TX_TIMER *timer_ptr,
 } /*** tx_timer_change() ***/
 
 /**---------------------------------------------------------------------
- * tx_timer_change_context() 
+ * tx_timer_change_context()
  *
  * FUNCTION:
  *
@@ -218,7 +218,7 @@ v_UINT_t tx_timer_change(TX_TIMER *timer_ptr,
  *
  * NOTE:
  *
- * @param  
+ * @param
  *
  * @return TX_SUCCESS.
  *
@@ -230,7 +230,7 @@ v_UINT_t tx_timer_change_context(TX_TIMER *timer_ptr, tANI_U32 expiration_input)
     if (TX_AIRGO_TMR_SIGNATURE != timer_ptr->tmrSignature) {
        VOS_ASSERT( timer_ptr->tmrSignature == 0 );
 
-       return TX_TIMER_ERROR;      
+       return TX_TIMER_ERROR;
     }
 
     // changes cannot be applied until timer stops running
@@ -247,7 +247,7 @@ v_UINT_t tx_timer_change_context(TX_TIMER *timer_ptr, tANI_U32 expiration_input)
 
 
 /**---------------------------------------------------------------------
- * tx_main_timer_func() 
+ * tx_main_timer_func()
  *
  * FUNCTION:
  *
@@ -257,7 +257,7 @@ v_UINT_t tx_timer_change_context(TX_TIMER *timer_ptr, tANI_U32 expiration_input)
  *
  * NOTE:
  *
- * @param  
+ * @param
  *
  * @return None.
  *
@@ -280,7 +280,7 @@ static v_VOID_t tx_main_timer_func( v_PVOID_t functionContext )
        return;
    }
 
-   VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO, 
+   VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO,
              "Timer %s triggered", TIMER_NAME);
 
    // Now call the actual timer function, taking the function pointer,
@@ -291,13 +291,13 @@ static v_VOID_t tx_main_timer_func( v_PVOID_t functionContext )
    if (0 != timer_ptr->rescheduleTimeInMsecs)
    {
       VOS_STATUS status;
-      status = vos_timer_start( &timer_ptr->vosTimer, 
+      status = vos_timer_start( &timer_ptr->vosTimer,
                                 timer_ptr->rescheduleTimeInMsecs );
       timer_ptr->rescheduleTimeInMsecs = 0;
 
       if (VOS_STATUS_SUCCESS != status)
       {
-         VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_WARN, 
+         VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_WARN,
              "Unable to reschedule timer %s; status=%d", TIMER_NAME, status);
       }
    }
@@ -305,10 +305,10 @@ static v_VOID_t tx_main_timer_func( v_PVOID_t functionContext )
 
 #ifdef TIMER_MANAGER
 v_UINT_t tx_timer_create_intern_debug( v_PVOID_t pMacGlobal, TX_TIMER *timer_ptr,
-   char *name_ptr, 
+   char *name_ptr,
    v_VOID_t ( *expiration_function )( v_PVOID_t, tANI_U32 ),
-   tANI_U32 expiration_input, v_ULONG_t initScheduleTimeInTicks, 
-   v_ULONG_t rescheduleTimeInTicks, v_ULONG_t auto_activate, 
+   tANI_U32 expiration_input, v_ULONG_t initScheduleTimeInTicks,
+   v_ULONG_t rescheduleTimeInTicks, v_ULONG_t auto_activate,
    char* fileName, v_U32_t lineNum)
 {
     VOS_STATUS status;
@@ -338,7 +338,7 @@ v_UINT_t tx_timer_create_intern_debug( v_PVOID_t pMacGlobal, TX_TIMER *timer_ptr
     strlcpy(timer_ptr->timerName, name_ptr, sizeof(timer_ptr->timerName));
 #endif // Store the timer name, for Debug build only
 
-    status = vos_timer_init_debug( &timer_ptr->vosTimer, VOS_TIMER_TYPE_SW, 
+    status = vos_timer_init_debug( &timer_ptr->vosTimer, VOS_TIMER_TYPE_SW,
           tx_main_timer_func, (v_PVOID_t)timer_ptr, fileName, lineNum);
     if (VOS_STATUS_SUCCESS != status)
     {
@@ -349,7 +349,7 @@ v_UINT_t tx_timer_create_intern_debug( v_PVOID_t pMacGlobal, TX_TIMER *timer_ptr
 
     if(0 != rescheduleTimeInTicks)
     {
-        VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO, 
+        VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO,
                   "Creating periodic timer for %s\n", TIMER_NAME);
     }
 
@@ -364,9 +364,9 @@ v_UINT_t tx_timer_create_intern_debug( v_PVOID_t pMacGlobal, TX_TIMER *timer_ptr
 } //** tx_timer_create() ***/
 #else
 v_UINT_t tx_timer_create_intern( v_PVOID_t pMacGlobal, TX_TIMER *timer_ptr,
-   char *name_ptr, 
+   char *name_ptr,
    v_VOID_t ( *expiration_function )( v_PVOID_t, tANI_U32 ),
-   tANI_U32 expiration_input, v_ULONG_t initScheduleTimeInTicks, 
+   tANI_U32 expiration_input, v_ULONG_t initScheduleTimeInTicks,
    v_ULONG_t rescheduleTimeInTicks, v_ULONG_t auto_activate )
 {
     VOS_STATUS status;
@@ -398,7 +398,7 @@ v_UINT_t tx_timer_create_intern( v_PVOID_t pMacGlobal, TX_TIMER *timer_ptr,
     strlcpy(timer_ptr->timerName, name_ptr, sizeof(timer_ptr->timerName));
 #endif // Store the timer name, for Debug build only
 
-    status = vos_timer_init( &timer_ptr->vosTimer, VOS_TIMER_TYPE_SW, 
+    status = vos_timer_init( &timer_ptr->vosTimer, VOS_TIMER_TYPE_SW,
           tx_main_timer_func, (v_PVOID_t)timer_ptr );
     if (VOS_STATUS_SUCCESS != status)
     {
@@ -409,7 +409,7 @@ v_UINT_t tx_timer_create_intern( v_PVOID_t pMacGlobal, TX_TIMER *timer_ptr,
 
     if(0 != rescheduleTimeInTicks)
     {
-        VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO, 
+        VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO,
                   "Creating periodic timer for %s\n", TIMER_NAME);
     }
 
@@ -426,7 +426,7 @@ v_UINT_t tx_timer_create_intern( v_PVOID_t pMacGlobal, TX_TIMER *timer_ptr,
 
 
 /**---------------------------------------------------------------------
- * tx_timer_deactivate() 
+ * tx_timer_deactivate()
  *
  * FUNCTION:
  *
@@ -436,7 +436,7 @@ v_UINT_t tx_timer_create_intern( v_PVOID_t pMacGlobal, TX_TIMER *timer_ptr,
  *
  * NOTE:
  *
- * @param  
+ * @param
  *
  * @return TX_SUCCESS.
  *
@@ -444,21 +444,21 @@ v_UINT_t tx_timer_create_intern( v_PVOID_t pMacGlobal, TX_TIMER *timer_ptr,
 v_UINT_t tx_timer_deactivate(TX_TIMER *timer_ptr)
 {
    VOS_STATUS vStatus;
-   VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO, 
+   VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO,
              "tx_timer_deactivate() called for timer %s\n", TIMER_NAME);
 
    // Put a check for the free builds
    if (TX_AIRGO_TMR_SIGNATURE != timer_ptr->tmrSignature)
    {
-      return TX_TIMER_ERROR;      
+      return TX_TIMER_ERROR;
    }
 
    // if the timer is not running then we do not need to do anything here
    vStatus = vos_timer_stop( &timer_ptr->vosTimer );
    if (VOS_STATUS_SUCCESS != vStatus)
    {
-      VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO_HIGH, 
-                "Unable to stop timer %s; status =%d\n", 
+      VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO_HIGH,
+                "Unable to stop timer %s; status =%d\n",
                 TIMER_NAME, vStatus);
    }
 
@@ -468,23 +468,23 @@ v_UINT_t tx_timer_deactivate(TX_TIMER *timer_ptr)
 
 v_UINT_t tx_timer_delete( TX_TIMER *timer_ptr )
 {
-   VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO, 
+   VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO,
              "tx_timer_delete() called for timer %s\n", TIMER_NAME);
 
    // Put a check for the free builds
    if (TX_AIRGO_TMR_SIGNATURE != timer_ptr->tmrSignature)
    {
-      return TX_TIMER_ERROR;      
+      return TX_TIMER_ERROR;
    }
 
    vos_timer_destroy( &timer_ptr->vosTimer );
-   return TX_SUCCESS;     
+   return TX_SUCCESS;
 } /*** tx_timer_delete() ***/
 
 
 
 /**---------------------------------------------------------------------
- * tx_timer_running() 
+ * tx_timer_running()
  *
  * FUNCTION:
  *
@@ -494,21 +494,21 @@ v_UINT_t tx_timer_delete( TX_TIMER *timer_ptr )
  *
  * NOTE:
  *
- * @param  
+ * @param
  *
  * @return TX_SUCCESS.
  *
  */
 v_BOOL_t tx_timer_running(TX_TIMER *timer_ptr)
 {
-   VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO, 
+   VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO,
              "tx_timer_running() called for timer %s\n", TIMER_NAME);
 
    // Put a check for the free builds
    if (TX_AIRGO_TMR_SIGNATURE != timer_ptr->tmrSignature)
-      return VOS_FALSE;      
+      return VOS_FALSE;
 
-   if (VOS_TIMER_STATE_RUNNING == 
+   if (VOS_TIMER_STATE_RUNNING ==
        vos_timer_getCurrentState( &timer_ptr->vosTimer ))
    {
        return VOS_TRUE;
diff --git a/CORE/SYS/legacy/src/system/src/macInitApi.c b/CORE/SYS/legacy/src/system/src/macInitApi.c
index d15c553c7be8..fcaac7bb7405 100644
--- a/CORE/SYS/legacy/src/system/src/macInitApi.c
+++ b/CORE/SYS/legacy/src/system/src/macInitApi.c
@@ -359,4 +359,3 @@ macSysResetReqFromHDD(void *pMac, tANI_U32 rc)
 {
     macSysResetReq( (tpAniSirGlobal)pMac, rc );
 }
-
diff --git a/CORE/SYS/legacy/src/system/src/sysEntryFunc.c b/CORE/SYS/legacy/src/system/src/sysEntryFunc.c
index 5e6e4e45e147..0feaf49fd5dc 100644
--- a/CORE/SYS/legacy/src/system/src/sysEntryFunc.c
+++ b/CORE/SYS/legacy/src/system/src/sysEntryFunc.c
@@ -247,9 +247,3 @@ void sysLog(tpAniSirGlobal pMac, tANI_U32 loglevel, const char *pString,...)
         va_end( marker );              /* Reset variable arguments.      */
     }
 }
-
-
-
-
-
-
diff --git a/CORE/SYS/legacy/src/utils/src/logDump.c b/CORE/SYS/legacy/src/utils/src/logDump.c
index f6ef3514507c..6ae4bd24f031 100644
--- a/CORE/SYS/legacy/src/utils/src/logDump.c
+++ b/CORE/SYS/legacy/src/utils/src/logDump.c
@@ -41,7 +41,7 @@ logDump.c
  *
  */
 
-/* 
+/*
  * @note : Bytes is to print overflow message information.
  */
 
@@ -362,11 +362,11 @@ static tANI_U32 print_menu(tpAniSirGlobal pMac, char  *p, tANI_U32 startId)
         nItems = pMac->dumpTableEntry[i]->nItems;
 
         for (j = 0; j < nItems; j++, pEntry++) {
-            if (pEntry->description == NULL) 
+            if (pEntry->description == NULL)
                 continue;
 
             if (pEntry->id == 0) {
-                ret = log_sprintf( pMac,p, "---- %s\n", pEntry->description); 
+                ret = log_sprintf( pMac,p, "---- %s\n", pEntry->description);
 
                 if (ret <= 0)
                     break;
@@ -426,7 +426,7 @@ int logRtaiDump( tpAniSirGlobal pMac, tANI_U32 cmd, tANI_U32 arg1, tANI_U32 arg2
                continue;
            }
        }
-       
+
        if((nItems > 0) && (pEntry != NULL)) {
            for (i = 0; i < nItems; i++, pEntry++) {
                if( cmd == pEntry->id ) {
diff --git a/CORE/SYS/legacy/src/utils/src/parserApi.c b/CORE/SYS/legacy/src/utils/src/parserApi.c
index 4035d9afc091..6fe5a0cfbe63 100644
--- a/CORE/SYS/legacy/src/utils/src/parserApi.c
+++ b/CORE/SYS/legacy/src/utils/src/parserApi.c
@@ -53,7 +53,7 @@
 
 
 ////////////////////////////////////////////////////////////////////////
-void dot11fLog(tpAniSirGlobal pMac, int loglevel, const char *pString,...) 
+void dot11fLog(tpAniSirGlobal pMac, int loglevel, const char *pString,...)
 {
 #ifdef WLAN_DEBUG
     if( (tANI_U32)loglevel > pMac->utils.gLogDbgLevel[LOG_INDEX_FOR_MODULE( SIR_DBG_MODULE_ID )] )
@@ -188,7 +188,7 @@ int FindIELocation( tpAniSirGlobal pMac,
     // The if/then/else statements that follow are here to figure out
     // whether we have the WPA IE, and where it is if we *do* have it.
 
-    //Save the first IE length 
+    //Save the first IE length
     ieLen = pRsnIe->rsnIEdata[ 1 ] + 2;
     idx = 0;
     bytesLeft = pRsnIe->length;
@@ -201,7 +201,7 @@ int FindIELocation( tpAniSirGlobal pMac,
             return (idx);
         }
         else if ( EID != pRsnIe->rsnIEdata[ idx ] &&
-             // & if no more IE, 
+             // & if no more IE,
              bytesLeft <= (tANI_U16)( ieLen ) )
         {
             dot11fLog( pMac, LOG3, FL("No IE (%d) in FindIELocation.\n"), EID );
@@ -246,7 +246,7 @@ PopulateDot11fCapabilities(tpAniSirGlobal         pMac,
 tSirRetStatus
 PopulateDot11fCapabilities2(tpAniSirGlobal         pMac,
                             tDot11fFfCapabilities *pDot11f,
-                            tpDphHashNode          pSta, 
+                            tpDphHashNode          pSta,
                             tpPESession            psessionEntry)
 {
     tANI_U16           cfg;
@@ -289,7 +289,7 @@ PopulateDot11fExtChanSwitchAnn(tpAniSirGlobal pMac,
                                tpPESession psessionEntry)
 {
     //Has to be updated on the cb state basis
-    pDot11f->secondaryChannelOffset = 
+    pDot11f->secondaryChannelOffset =
              psessionEntry->gLimChannelSwitch.secondarySubBand;
 
     pDot11f->present = 1;
@@ -382,7 +382,7 @@ PopulateDot11fDSParams(tpAniSirGlobal     pMac,
 
 void
 PopulateDot11fEDCAParamSet(tpAniSirGlobal         pMac,
-                           tDot11fIEEDCAParamSet *pDot11f, 
+                           tDot11fIEEDCAParamSet *pDot11f,
                            tpPESession psessionEntry)
 {
 
@@ -459,10 +459,10 @@ PopulateDot11fERPInfo(tpAniSirGlobal    pMac,
         }
 
 
-        if((psessionEntry->gLimNoShortParams.numNonShortPreambleSta) 
-                 || !psessionEntry->beaconParams.fShortPreamble){ 
+        if((psessionEntry->gLimNoShortParams.numNonShortPreambleSta)
+                 || !psessionEntry->beaconParams.fShortPreamble){
                 pDot11f->barker_preamble = 1;
-         
+
         }
         // if protection always flag is set, advertise protection enabled
         // regardless of legacy stations presence
@@ -479,7 +479,7 @@ PopulateDot11fERPInfo(tpAniSirGlobal    pMac,
 
 tSirRetStatus
 PopulateDot11fExtSuppRates(tpAniSirGlobal pMac, tANI_U8 nChannelNum,
-                           tDot11fIEExtSuppRates *pDot11f, 
+                           tDot11fIEExtSuppRates *pDot11f,
                            tpPESession psessionEntry)
 {
     tSirRetStatus nSirStatus;
@@ -755,7 +755,7 @@ void limLogVHTExtBssLoad(tpAniSirGlobal pMac,
 }
 
 
-void limLogOperatingMode( tpAniSirGlobal pMac, 
+void limLogOperatingMode( tpAniSirGlobal pMac,
                                tDot11fIEOperatingMode *pDot11f)
 {
 #ifdef DUMP_MGMT_CNTNTS
@@ -1036,11 +1036,11 @@ PopulateDot11fOperatingMode(tpAniSirGlobal      pMac,
                            tpPESession   psessionEntry)
 {
     pDot11f->present = 1;
-    
+
     pDot11f->chanWidth = psessionEntry->gLimOperatingMode.chanWidth;
     pDot11f->rxNSS = psessionEntry->gLimOperatingMode.rxNSS;
     pDot11f->rxNSSType = psessionEntry->gLimOperatingMode.rxNSSType;
-    
+
     return eSIR_SUCCESS;
 }
 
@@ -1249,7 +1249,7 @@ PopulateDot11fPowerCaps(tpAniSirGlobal      pMac,
         pCaps->maxTxPower = psessionEntry->pLimJoinReq->powerCap.maxTxPower;
 
     }
-    
+
     pCaps->present    = 1;
 } // End PopulateDot11fPowerCaps.
 
@@ -1286,9 +1286,9 @@ PopulateDot11fQOSCapsStation(tpAniSirGlobal    pMac,
 {
     tANI_U32  val = 0;
 
-    if(wlan_cfgGetInt(pMac, WNI_CFG_MAX_SP_LENGTH, &val) != eSIR_SUCCESS) 
+    if(wlan_cfgGetInt(pMac, WNI_CFG_MAX_SP_LENGTH, &val) != eSIR_SUCCESS)
         PELOGE(limLog(pMac, LOGE, FL("could not retrieve Max SP Length \n"));)
-   
+
     pDot11f->more_data_ack = 0;
     pDot11f->max_sp_length = (tANI_U8)val;
     pDot11f->qack    = 0;
@@ -1299,7 +1299,7 @@ PopulateDot11fQOSCapsStation(tpAniSirGlobal    pMac,
         pDot11f->acbk_uapsd = LIM_UAPSD_GET(ACBK, pMac->lim.gUapsdPerAcBitmask);
         pDot11f->acvi_uapsd = LIM_UAPSD_GET(ACVI, pMac->lim.gUapsdPerAcBitmask);
         pDot11f->acvo_uapsd = LIM_UAPSD_GET(ACVO, pMac->lim.gUapsdPerAcBitmask);
-    }   
+    }
     pDot11f->present = 1;
 } // End PopulatedDot11fQOSCaps.
 
@@ -1638,9 +1638,9 @@ void PopulateDot11fReAssocTspec(tpAniSirGlobal pMac, tDot11fReAssocRequest *pRea
         }
     }
 }
-#endif 
+#endif
 
-void PopulateDot11fWMMInfoAp(tpAniSirGlobal pMac, tDot11fIEWMMInfoAp *pInfo, 
+void PopulateDot11fWMMInfoAp(tpAniSirGlobal pMac, tDot11fIEWMMInfoAp *pInfo,
                              tpPESession psessionEntry)
 {
     pInfo->version = SIR_MAC_OUI_VERSION_1;
@@ -1675,7 +1675,7 @@ void PopulateDot11fWMMInfoStation(tpAniSirGlobal pMac, tDot11fIEWMMInfoStation *
     pInfo->acbk_uapsd = LIM_UAPSD_GET(ACBK, pMac->lim.gUapsdPerAcBitmask);
     pInfo->acbe_uapsd = LIM_UAPSD_GET(ACBE, pMac->lim.gUapsdPerAcBitmask);
 
-    if(wlan_cfgGetInt(pMac, WNI_CFG_MAX_SP_LENGTH, &val) != eSIR_SUCCESS) 
+    if(wlan_cfgGetInt(pMac, WNI_CFG_MAX_SP_LENGTH, &val) != eSIR_SUCCESS)
         PELOGE(limLog(pMac, LOGE, FL("could not retrieve Max SP Length \n"));)
 
     pInfo->max_sp_length = (tANI_U8)val;
@@ -1710,7 +1710,7 @@ void PopulateDot11fWMMParams(tpAniSirGlobal      pMac,
     if(psessionEntry->limSystemRole == eLIM_AP_ROLE)
        pParams->qosInfo =
            (psessionEntry->apUapsdEnable << 7) | ((tANI_U8)(0x0f & psessionEntry->gLimEdcaParamSetCount));
-    else 
+    else
        pParams->qosInfo =
            (pMac->lim.gUapsdEnable << 7) | ((tANI_U8)(0x0f & psessionEntry->gLimEdcaParamSetCount));
 
@@ -2293,12 +2293,12 @@ sirConvertAssocReqFrame2Struct(tpAniSirGlobal pMac,
     }
 
     // WSC IE
-    if (ar->WscIEOpaque.present) 
+    if (ar->WscIEOpaque.present)
     {
         pAssocReq->addIEPresent = 1;
         ConvertWscOpaque(pMac, &pAssocReq->addIE, &ar->WscIEOpaque);
     }
-    
+
 
     if(ar->P2PIEOpaque.present)
     {
@@ -2513,7 +2513,7 @@ sirConvertAssocRespFrame2Struct(tpAniSirGlobal pMac,
         pAssocRsp->num_RICData = ar.num_RICDataDesc;
         pAssocRsp->ricPresent = TRUE;
     }
-#endif    
+#endif
 
 #ifdef FEATURE_WLAN_CCX
     if (ar.num_WMMTSPEC) {
@@ -2524,13 +2524,13 @@ sirConvertAssocRespFrame2Struct(tpAniSirGlobal pMac,
         }
         pAssocRsp->tspecPresent = TRUE;
     }
-   
+
     if(ar.CCXTrafStrmMet.present)
     {
         pAssocRsp->tsmPresent = 1;
         vos_mem_copy(&pAssocRsp->tsmIE.tsid,
                 &ar.CCXTrafStrmMet.tsid,sizeof(tSirMacCCXTSMIE));
-    }    
+    }
 #endif
 
 #ifdef WLAN_FEATURE_11AC
@@ -2702,12 +2702,12 @@ sirConvertReassocReqFrame2Struct(tpAniSirGlobal pMac,
     // there is in 'sirConvertAssocReqFrame2Struct'?
 
     // WSC IE
-    if (ar.WscIEOpaque.present) 
+    if (ar.WscIEOpaque.present)
     {
         pAssocReq->addIEPresent = 1;
         ConvertWscOpaque(pMac, &pAssocReq->addIE, &ar.WscIEOpaque);
     }
-    
+
     if(ar.P2PIEOpaque.present)
     {
         pAssocReq->addIEPresent = 1;
@@ -3224,7 +3224,7 @@ sirParseBeaconIE(tpAniSirGlobal        pMac,
     {
         pBeaconStruct->channelNumber = pBies->HTInfo.primaryChannel;
     }
-    
+
     if ( pBies->RSN.present )
     {
         pBeaconStruct->rsnPresent = 1;
@@ -3310,7 +3310,7 @@ sirConvertBeaconFrame2Struct(tpAniSirGlobal       pMac,
     pHdr     = WDA_GET_RX_MAC_HEADER( pFrame );
     mappedRXCh = WDA_GET_RX_CH( pFrame );
     rfBand = WDA_GET_RX_RFBAND( pFrame );
-    
+
     // Zero-init our [out] parameter,
     vos_mem_set( ( tANI_U8* )pBeaconStruct, sizeof(tSirProbeRespBeacon), 0 );
 
@@ -3372,7 +3372,7 @@ sirConvertBeaconFrame2Struct(tpAniSirGlobal       pMac,
     pBeaconStruct->capabilityInfo.dsssOfdm      = pBeacon->Capabilities.dsssOfdm;
     pBeaconStruct->capabilityInfo.delayedBA     = pBeacon->Capabilities.delayedBA;
     pBeaconStruct->capabilityInfo.immediateBA    = pBeacon->Capabilities.immediateBA;
- 
+
     if ( ! pBeacon->SSID.present )
     {
         PELOGW(limLog(pMac, LOGW, FL("Mandatory IE SSID not present!\n"));)
@@ -3595,7 +3595,7 @@ sirConvertBeaconFrame2Struct(tpAniSirGlobal       pMac,
         pBeaconStruct->WiderBWChanSwitchAnnPresent = 1;
         vos_mem_copy( &pBeaconStruct->WiderBWChanSwitchAnn, &pBeacon->WiderBWChanSwitchAnn,
                       sizeof( tDot11fIEWiderBWChanSwitchAnn));
-    }      
+    }
 #endif
 
     vos_mem_free(pBeacon);
@@ -4535,12 +4535,12 @@ tSirRetStatus DePopulateDot11fWscRegistrarInfo(tpAniSirGlobal pMac,
 }
 tSirRetStatus PopulateDot11fProbeResWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscProbeRes *pDot11f, tpPESession psessionEntry)
 {
- 
+
    tSirWPSProbeRspIE *pSirWPSProbeRspIE;
 
    pSirWPSProbeRspIE = &psessionEntry->APWPSIEs.SirWPSProbeRspIE;
-   
-    
+
+
     if(pSirWPSProbeRspIE->FieldPresent & SIR_WPS_PROBRSP_VER_PRESENT)
     {
         pDot11f->present = 1;
@@ -4556,13 +4556,13 @@ tSirRetStatus PopulateDot11fProbeResWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscProb
 
     if(pSirWPSProbeRspIE->FieldPresent & SIR_WPS_PROBRSP_STATE_PRESENT)
     {
-        
+
         pDot11f->WPSState.present = 1;
         pDot11f->WPSState.state = (tANI_U8)pSirWPSProbeRspIE->wpsState;
     }
     else
         pDot11f->WPSState.present = 0;
-        
+
     if(pSirWPSProbeRspIE->FieldPresent & SIR_WPS_PROBRSP_APSETUPLOCK_PRESENT)
     {
         pDot11f->APSetupLocked.present = 1;
@@ -4570,7 +4570,7 @@ tSirRetStatus PopulateDot11fProbeResWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscProb
     }
     else
         pDot11f->APSetupLocked.present = 0;
-        
+
     if(pSirWPSProbeRspIE->FieldPresent & SIR_WPS_PROBRSP_SELECTEDREGISTRA_PRESENT)
     {
         pDot11f->SelectedRegistrar.present = 1;
@@ -4578,7 +4578,7 @@ tSirRetStatus PopulateDot11fProbeResWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscProb
     }
     else
          pDot11f->SelectedRegistrar.present = 0;
-    
+
     if(pSirWPSProbeRspIE->FieldPresent & SIR_WPS_PROBRSP_DEVICEPASSWORDID_PRESENT)
     {
         pDot11f->DevicePasswordID.present = 1;
@@ -4586,7 +4586,7 @@ tSirRetStatus PopulateDot11fProbeResWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscProb
     }
     else
         pDot11f->DevicePasswordID.present = 0;
-        
+
     if(pSirWPSProbeRspIE->FieldPresent & SIR_WPS_PROBRSP_SELECTEDREGISTRACFGMETHOD_PRESENT)
     {
         pDot11f->SelectedRegistrarConfigMethods.present = 1;
@@ -4594,7 +4594,7 @@ tSirRetStatus PopulateDot11fProbeResWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscProb
     }
     else
         pDot11f->SelectedRegistrarConfigMethods.present = 0;
-        
+
     if(pSirWPSProbeRspIE->FieldPresent & SIR_WPS_PROBRSP_RESPONSETYPE_PRESENT)
     {
         pDot11f->ResponseType.present = 1;
@@ -4602,7 +4602,7 @@ tSirRetStatus PopulateDot11fProbeResWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscProb
     }
     else
         pDot11f->ResponseType.present = 0;
-        
+
     if(pSirWPSProbeRspIE->FieldPresent & SIR_WPS_PROBRSP_UUIDE_PRESENT)
     {
         pDot11f->UUID_E.present = 1;
@@ -4610,17 +4610,17 @@ tSirRetStatus PopulateDot11fProbeResWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscProb
     }
     else
         pDot11f->UUID_E.present = 0;
-    
+
     if(pSirWPSProbeRspIE->FieldPresent & SIR_WPS_PROBRSP_MANUFACTURE_PRESENT)
     {
         pDot11f->Manufacturer.present = 1;
         pDot11f->Manufacturer.num_name = pSirWPSProbeRspIE->Manufacture.num_name;
         vos_mem_copy(pDot11f->Manufacturer.name, pSirWPSProbeRspIE->Manufacture.name,
                      pSirWPSProbeRspIE->Manufacture.num_name);
-    } 
+    }
     else
         pDot11f->Manufacturer.present = 0;
-        
+
     if(pSirWPSProbeRspIE->FieldPresent & SIR_WPS_PROBRSP_MODELNUMBER_PRESENT)
     {
         pDot11f->ModelName.present = 1;
@@ -4630,7 +4630,7 @@ tSirRetStatus PopulateDot11fProbeResWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscProb
     }
     else
       pDot11f->ModelName.present = 0;
-    
+
     if(pSirWPSProbeRspIE->FieldPresent & SIR_WPS_PROBRSP_MODELNUMBER_PRESENT)
     {
         pDot11f->ModelNumber.present = 1;
@@ -4640,7 +4640,7 @@ tSirRetStatus PopulateDot11fProbeResWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscProb
     }
     else
         pDot11f->ModelNumber.present = 0;
-    
+
     if(pSirWPSProbeRspIE->FieldPresent & SIR_WPS_PROBRSP_SERIALNUMBER_PRESENT)
     {
         pDot11f->SerialNumber.present = 1;
@@ -4650,7 +4650,7 @@ tSirRetStatus PopulateDot11fProbeResWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscProb
     }
     else
         pDot11f->SerialNumber.present = 0;
-    
+
     if(pSirWPSProbeRspIE->FieldPresent & SIR_WPS_PROBRSP_PRIMARYDEVICETYPE_PRESENT)
     {
         pDot11f->PrimaryDeviceType.present = 1;
@@ -4661,7 +4661,7 @@ tSirRetStatus PopulateDot11fProbeResWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscProb
     }
     else
         pDot11f->PrimaryDeviceType.present = 0;
-    
+
     if(pSirWPSProbeRspIE->FieldPresent & SIR_WPS_PROBRSP_DEVICENAME_PRESENT)
     {
         pDot11f->DeviceName.present = 1;
@@ -4671,7 +4671,7 @@ tSirRetStatus PopulateDot11fProbeResWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscProb
     }
     else
         pDot11f->DeviceName.present = 0;
-    
+
     if(pSirWPSProbeRspIE->FieldPresent & SIR_WPS_PROBRSP_CONFIGMETHODS_PRESENT)
     {
         pDot11f->ConfigMethods.present = 1;
@@ -4679,16 +4679,16 @@ tSirRetStatus PopulateDot11fProbeResWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscProb
     }
     else
         pDot11f->ConfigMethods.present = 0;
-    
-    
+
+
     if(pSirWPSProbeRspIE->FieldPresent & SIR_WPS_PROBRSP_RF_BANDS_PRESENT)
     {
         pDot11f->RFBands.present = 1;
         pDot11f->RFBands.bands = pSirWPSProbeRspIE->RFBand;
     }
     else
-       pDot11f->RFBands.present = 0;      
-       
+       pDot11f->RFBands.present = 0;
+
     return eSIR_SUCCESS;
 }
 tSirRetStatus PopulateDot11fAssocResWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscAssocRes *pDot11f, tpPESession psessionEntry)
@@ -4696,7 +4696,7 @@ tSirRetStatus PopulateDot11fAssocResWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscAsso
    tSirWPSProbeRspIE *pSirWPSProbeRspIE;
 
    pSirWPSProbeRspIE = &psessionEntry->APWPSIEs.SirWPSProbeRspIE;
-   
+
     if(pSirWPSProbeRspIE->FieldPresent & SIR_WPS_PROBRSP_VER_PRESENT)
     {
         pDot11f->present = 1;
@@ -4709,26 +4709,26 @@ tSirRetStatus PopulateDot11fAssocResWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscAsso
         pDot11f->present = 0;
         pDot11f->Version.present = 0;
     }
-    
+
     if(pSirWPSProbeRspIE->FieldPresent & SIR_WPS_PROBRSP_RESPONSETYPE_PRESENT)
     {
         pDot11f->ResponseType.present = 1;
         pDot11f->ResponseType.resType = pSirWPSProbeRspIE->ResponseType;
     }
     else
-        pDot11f->ResponseType.present = 0;    
+        pDot11f->ResponseType.present = 0;
 
     return eSIR_SUCCESS;
 }
 
 tSirRetStatus PopulateDot11fBeaconWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscBeacon *pDot11f, tpPESession psessionEntry)
 {
- 
+
    tSirWPSBeaconIE *pSirWPSBeaconIE;
 
    pSirWPSBeaconIE = &psessionEntry->APWPSIEs.SirWPSBeaconIE;
-   
-    
+
+
     if(pSirWPSBeaconIE->FieldPresent & SIR_WPS_PROBRSP_VER_PRESENT)
     {
         pDot11f->present = 1;
@@ -4741,16 +4741,16 @@ tSirRetStatus PopulateDot11fBeaconWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscBeacon
         pDot11f->present = 0;
         pDot11f->Version.present = 0;
     }
-    
+
     if(pSirWPSBeaconIE->FieldPresent & SIR_WPS_BEACON_STATE_PRESENT)
     {
-        
+
         pDot11f->WPSState.present = 1;
         pDot11f->WPSState.state = (tANI_U8)pSirWPSBeaconIE->wpsState;
     }
     else
         pDot11f->WPSState.present = 0;
-        
+
     if(pSirWPSBeaconIE->FieldPresent & SIR_WPS_BEACON_APSETUPLOCK_PRESENT)
     {
         pDot11f->APSetupLocked.present = 1;
@@ -4758,7 +4758,7 @@ tSirRetStatus PopulateDot11fBeaconWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscBeacon
     }
     else
         pDot11f->APSetupLocked.present = 0;
-        
+
     if(pSirWPSBeaconIE->FieldPresent & SIR_WPS_BEACON_SELECTEDREGISTRA_PRESENT)
     {
         pDot11f->SelectedRegistrar.present = 1;
@@ -4766,7 +4766,7 @@ tSirRetStatus PopulateDot11fBeaconWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscBeacon
     }
     else
          pDot11f->SelectedRegistrar.present = 0;
-    
+
     if(pSirWPSBeaconIE->FieldPresent & SIR_WPS_BEACON_DEVICEPASSWORDID_PRESENT)
     {
         pDot11f->DevicePasswordID.present = 1;
@@ -4774,7 +4774,7 @@ tSirRetStatus PopulateDot11fBeaconWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscBeacon
     }
     else
         pDot11f->DevicePasswordID.present = 0;
-        
+
     if(pSirWPSBeaconIE->FieldPresent & SIR_WPS_BEACON_SELECTEDREGISTRACFGMETHOD_PRESENT)
     {
         pDot11f->SelectedRegistrarConfigMethods.present = 1;
@@ -4782,7 +4782,7 @@ tSirRetStatus PopulateDot11fBeaconWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscBeacon
     }
     else
         pDot11f->SelectedRegistrarConfigMethods.present = 0;
-        
+
     if(pSirWPSBeaconIE->FieldPresent & SIR_WPS_BEACON_UUIDE_PRESENT)
     {
         pDot11f->UUID_E.present = 1;
@@ -4790,16 +4790,16 @@ tSirRetStatus PopulateDot11fBeaconWPSIEs(tpAniSirGlobal pMac, tDot11fIEWscBeacon
     }
     else
         pDot11f->UUID_E.present = 0;
-    
-       
+
+
     if(pSirWPSBeaconIE->FieldPresent & SIR_WPS_BEACON_RF_BANDS_PRESENT)
     {
         pDot11f->RFBands.present = 1;
         pDot11f->RFBands.bands = pSirWPSBeaconIE->RFBand;
     }
     else
-       pDot11f->RFBands.present = 0;      
-       
+       pDot11f->RFBands.present = 0;
+
     return eSIR_SUCCESS;
 }
 tSirRetStatus PopulateDot11fWscInProbeRes(tpAniSirGlobal pMac,
@@ -5016,18 +5016,18 @@ tSirRetStatus DePopulateDot11fWscRegistrarInfoInProbeRes(tpAniSirGlobal pMac,
     return eSIR_SUCCESS;
 }
 
-tSirRetStatus PopulateDot11fAssocResWscIE(tpAniSirGlobal pMac, 
-                                          tDot11fIEWscAssocRes *pDot11f, 
+tSirRetStatus PopulateDot11fAssocResWscIE(tpAniSirGlobal pMac,
+                                          tDot11fIEWscAssocRes *pDot11f,
                                           tpSirAssocReq pRcvdAssocReq)
 {
     tDot11fIEWscAssocReq parsedWscAssocReq = { 0, };
     tANI_U8         *wscIe;
-    
+
 
     wscIe = limGetWscIEPtr(pMac, pRcvdAssocReq->addIE.addIEdata, pRcvdAssocReq->addIE.length);
     if(wscIe != NULL)
     {
-        // retreive WSC IE from given AssocReq 
+        // retreive WSC IE from given AssocReq
         dot11fUnpackIeWscAssocReq( pMac,
                                     wscIe + 2 + 4,  // EID, length, OUI
                                     wscIe[ 1 ] - 4, // length without OUI
@@ -5039,7 +5039,7 @@ tSirRetStatus PopulateDot11fAssocResWscIE(tpAniSirGlobal pMac,
         pDot11f->Version.minor = 0x0;
 
         pDot11f->ResponseType.present = 1;
-        
+
         if ((parsedWscAssocReq.RequestType.reqType == REQ_TYPE_REGISTRAR) ||
             (parsedWscAssocReq.RequestType.reqType == REQ_TYPE_WLAN_MANAGER_REGISTRAR))
         {
@@ -5053,7 +5053,7 @@ tSirRetStatus PopulateDot11fAssocResWscIE(tpAniSirGlobal pMac,
         // TODO: currently it takes from peers only
         if(parsedWscAssocReq.VendorExtension.present &&
            parsedWscAssocReq.VendorExtension.Version2.present)
-        {   
+        {
             pDot11f->VendorExtension.present = 1;
             pDot11f->VendorExtension.vendorId[0] = 0x00;
             pDot11f->VendorExtension.vendorId[1] = 0x37;
@@ -5066,8 +5066,8 @@ tSirRetStatus PopulateDot11fAssocResWscIE(tpAniSirGlobal pMac,
     return eSIR_SUCCESS;
 }
 
-tSirRetStatus PopulateDot11AssocResP2PIE(tpAniSirGlobal pMac, 
-                                       tDot11fIEP2PAssocRes *pDot11f, 
+tSirRetStatus PopulateDot11AssocResP2PIE(tpAniSirGlobal pMac,
+                                       tDot11fIEP2PAssocRes *pDot11f,
                                        tpSirAssocReq pRcvdAssocReq)
 {
     tANI_U8         *p2pIe;
@@ -5124,7 +5124,7 @@ tSirRetStatus PopulateDot11fBeaconReport( tpAniSirGlobal pMac, tDot11fIEMeasurem
 }
 
 tSirRetStatus PopulateDot11fRRMIe( tpAniSirGlobal pMac, tDot11fIERRMEnabledCap *pDot11f, tpPESession    psessionEntry )
-{  
+{
    tpRRMCaps pRrmCaps;
 
    pRrmCaps = rrmGetCapabilities( pMac, psessionEntry );
@@ -5173,7 +5173,7 @@ void PopulateMDIE( tpAniSirGlobal        pMac,
    // Plugfest fix
    pDot11f->overDSCap =   (mdie[2] & 0x01);
    pDot11f->resourceReqCap = ((mdie[2] >> 1) & 0x01);
-   
+
 }
 
 void PopulateFTInfo( tpAniSirGlobal      pMac,
@@ -5186,7 +5186,7 @@ void PopulateFTInfo( tpAniSirGlobal      pMac,
 }
 #endif
 
-void PopulateDot11fAssocRspRates ( tpAniSirGlobal pMac, tDot11fIESuppRates *pSupp, 
+void PopulateDot11fAssocRspRates ( tpAniSirGlobal pMac, tDot11fIESuppRates *pSupp,
       tDot11fIEExtSuppRates *pExt, tANI_U16 *_11bRates, tANI_U16 *_11aRates )
 {
   tANI_U8 num_supp = 0, num_ext = 0;
@@ -5195,14 +5195,14 @@ void PopulateDot11fAssocRspRates ( tpAniSirGlobal pMac, tDot11fIESuppRates *pSup
   for( i = 0 ; (i < SIR_NUM_11B_RATES && _11bRates[i]) ; i++, num_supp++ )
   {
       pSupp->rates[num_supp] = (tANI_U8)_11bRates[i];
-  }  
+  }
   for( j = 0 ; (j < SIR_NUM_11A_RATES && _11aRates[j]) ; j++ )
   {
      if( num_supp < 8 )
          pSupp->rates[num_supp++] = (tANI_U8)_11aRates[j];
      else
-         pExt->rates[num_ext++] =  (tANI_U8)_11aRates[j]; 
-  }  
+         pExt->rates[num_ext++] =  (tANI_U8)_11aRates[j];
+  }
 
   if( num_supp )
   {
@@ -5214,5 +5214,5 @@ void PopulateDot11fAssocRspRates ( tpAniSirGlobal pMac, tDot11fIESuppRates *pSup
      pExt->num_rates = num_ext;
      pExt->present = 1;
   }
-} 
+}
 // parserApi.c ends here.
diff --git a/CORE/SYS/legacy/src/utils/src/utilsApi.c b/CORE/SYS/legacy/src/utils/src/utilsApi.c
index 731987961869..6bdd50ee5ba6 100644
--- a/CORE/SYS/legacy/src/utils/src/utilsApi.c
+++ b/CORE/SYS/legacy/src/utils/src/utilsApi.c
@@ -29,7 +29,7 @@
 //
 //  File:         utilsApi.cc
 //
-//  Description:  Implemention of a few utility routines. 
+//  Description:  Implemention of a few utility routines.
 //
 //  Author:       Neelay Das
 //
diff --git a/CORE/SYS/legacy/src/utils/src/utilsParser.c b/CORE/SYS/legacy/src/utils/src/utilsParser.c
index 7c3215966ae4..bf9a316d8fa4 100644
--- a/CORE/SYS/legacy/src/utils/src/utilsParser.c
+++ b/CORE/SYS/legacy/src/utils/src/utilsParser.c
@@ -73,7 +73,7 @@ void ConvertQOSCaps(tpAniSirGlobal                pMac,
     pOld->type    = 46;
     pOld->length  = 1;
 
-    pOld->qosInfo.count   = pNew->count;   
+    pOld->qosInfo.count   = pNew->count;
 }
 
 
@@ -90,7 +90,7 @@ void ConvertQOSCapsStation(tpAniSirGlobal              pMac,
     pOld->qosInfo.acbe_uapsd  = pNew->acbe_uapsd;
     pOld->qosInfo.acbk_uapsd  = pNew->acbk_uapsd;
     pOld->qosInfo.acvi_uapsd  = pNew->acvi_uapsd;
-    pOld->qosInfo.acvo_uapsd  = pNew->acvo_uapsd;    
+    pOld->qosInfo.acvo_uapsd  = pNew->acvo_uapsd;
 }
 
 tSirRetStatus ConvertWPA(tpAniSirGlobal  pMac,
@@ -137,7 +137,7 @@ tSirRetStatus ConvertWscOpaque( tpAniSirGlobal      pMac,
 {
     // This is awful, I know, but the old code just rammed the IE into
     // an opaque array.  Note that we need to explicitly add the vendorIE and OUI !
-    tANI_U8 curAddIELen = pOld->length; 
+    tANI_U8 curAddIELen = pOld->length;
 
     pOld->length    = curAddIELen + pNew->num_data + 6;
     pOld->addIEdata[ curAddIELen++ ] = 0xdd;
@@ -157,7 +157,7 @@ tSirRetStatus ConvertP2POpaque( tpAniSirGlobal      pMac,
 {
     // This is awful, I know, but the old code just rammed the IE into
     // an opaque array.  Note that we need to explicitly add the vendorIE and OUI !
-    tANI_U8 curAddIELen = pOld->length; 
+    tANI_U8 curAddIELen = pOld->length;
 
     pOld->length    = curAddIELen + pNew->num_data + 6;
     pOld->addIEdata[ curAddIELen++ ] = 0xdd;
@@ -178,7 +178,7 @@ tSirRetStatus ConvertWFDOpaque( tpAniSirGlobal      pMac,
 {
     // This is awful, I know, but the old code just rammed the IE into
     // an opaque array.  Note that we need to explicitly add the vendorIE and OUI !
-    tANI_U8 curAddIELen = pOld->length; 
+    tANI_U8 curAddIELen = pOld->length;
 
     pOld->length    = curAddIELen + pNew->num_data + 6;
     pOld->addIEdata[ curAddIELen++ ] = 0xdd;
@@ -615,7 +615,7 @@ void ConvertWMMSchedule(tpAniSirGlobal        pMac,
 }
 
 /**
-    @brief   :    This functions converts the given buffer till given size to Big endian format assuming the 
+    @brief   :    This functions converts the given buffer till given size to Big endian format assuming the
                      bus is 32 bit. The size should be four byte aligned.
     @param :    ptr to be converted, size
     @return  :    void
@@ -663,7 +663,7 @@ void CreateScanDataNullFrame(tpAniSirGlobal pMac, tSirMacMgmtHdr *macMgmtHdr,
                               (void *)selfMacAddr, sizeof(tSirMacAddr));
     vos_mem_copy( (void *)&macMgmtHdr->bssId,
                               (void *)bssid, sizeof(tSirMacAddr));
-    
+
     return;
 }
 
@@ -675,7 +675,7 @@ void CreateScanCtsFrame(tpAniSirGlobal pMac, tSirMacMgmtHdr *macMgmtHdr, tSirMac
     macMgmtHdr->fc.order = 0;
     macMgmtHdr->fc.wep = 0;
     macMgmtHdr->fc.moreData =0;
-    macMgmtHdr->fc.powerMgmt = 0;  
+    macMgmtHdr->fc.powerMgmt = 0;
     macMgmtHdr->fc.retry = 0;
     macMgmtHdr->fc.moreFrag = 0;
     macMgmtHdr->fc.fromDS = 0;
@@ -683,7 +683,7 @@ void CreateScanCtsFrame(tpAniSirGlobal pMac, tSirMacMgmtHdr *macMgmtHdr, tSirMac
     macMgmtHdr->durationLo = (tANI_U8) (SIR_MAC_MAX_DURATION_MICRO_SECONDS & 0xff);
     macMgmtHdr->durationHi = (tANI_U8) ((SIR_MAC_MAX_DURATION_MICRO_SECONDS & 0xff00) >> 8);
     vos_mem_copy( (void *)macMgmtHdr->da, (void *)selfMac, sizeof(tSirMacAddr));
-            
+
     return;
 }
 
@@ -694,7 +694,7 @@ void CreateScanCtsFrame(tpAniSirGlobal pMac, tSirMacMgmtHdr *macMgmtHdr, tSirMac
 
 
 /**
-    @brief    :    This functions creates a DATA_NULL/CTS2SELF frame in Big endian format 
+    @brief    :    This functions creates a DATA_NULL/CTS2SELF frame in Big endian format
     @param    :    Global MAC structure, pointer to return the created packet, role which is Station/AP
     @return    :    void
 */
@@ -703,7 +703,7 @@ void CreateInitScanRawFrame(tpAniSirGlobal pMac, tSirMacMgmtHdr *macMgmtHdr, tBs
 {
 #if 0
     tpStaStruct pSta = (tpStaStruct) pMac->hal.halMac.staTable;
-    
+
     if (role == eSYSTEM_STA_ROLE)
     {
         macMgmtHdr->fc.type = SIR_MAC_DATA_FRAME;
@@ -747,7 +747,7 @@ void CreateInitScanRawFrame(tpAniSirGlobal pMac, tSirMacMgmtHdr *macMgmtHdr, tBs
 }
 
 /**
-    @brief    :    This functions creates a DATA_NULL frame in Big endian format 
+    @brief    :    This functions creates a DATA_NULL frame in Big endian format
     @param    :    Global MAC structure, pointer to return the created packet, role which is Station/AP
     @return    :    void
 */
@@ -781,7 +781,7 @@ void CreateFinishScanRawFrame(tpAniSirGlobal pMac, tSirMacMgmtHdr *macMgmtHdr, t
         vos_mem_copy( (void *)macMgmtHdr->bssId, (void *)pSta[0].bssId, 6);
 
     }
-    
+
     return;
 #endif
 }
diff --git a/CORE/VOSS/src/vos_sched.c b/CORE/VOSS/src/vos_sched.c
index 1580356f72fa..4109c5877ab6 100644
--- a/CORE/VOSS/src/vos_sched.c
+++ b/CORE/VOSS/src/vos_sched.c
@@ -256,9 +256,14 @@ vos_sched_open
   spin_lock_init(&pSchedContext->TlshimRxQLock);
   spin_lock_init(&pSchedContext->VosTlshimPktFreeQLock);
   INIT_LIST_HEAD(&pSchedContext->tlshimRxQueue);
+  spin_lock_bh(&pSchedContext->VosTlshimPktFreeQLock);
   INIT_LIST_HEAD(&pSchedContext->VosTlshimPktFreeQ);
   if (vos_alloc_tlshim_pkt_freeq(pSchedContext) !=  VOS_STATUS_SUCCESS)
+  {
+       spin_unlock_bh(&pSchedContext->VosTlshimPktFreeQLock);
        return VOS_STATUS_E_FAILURE;
+  }
+  spin_unlock_bh(&pSchedContext->VosTlshimPktFreeQLock);
   register_hotcpu_notifier(&vos_cpu_hotplug_notifier);
   pSchedContext->cpuHotPlugNotifier = &vos_cpu_hotplug_notifier;
 #endif