Merge "Release 1.0.0.237 QCACLD WLAN Drive"

14 files changed, 5 insertions, 380 deletions

diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 6318fe48b617..3fcd5907265e 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -1705,7 +1705,6 @@ hdd_adapter_t *hdd_get_con_sap_adapter(hdd_adapter_t *this_sap_adapter);
 boolean hdd_is_5g_supported(hdd_context_t * pHddCtx);
 
 #ifdef FEATURE_GREEN_AP
-boolean hdd_wlan_green_ap_is_ps_on(hdd_context_t *pHddCtx);
 int hdd_wlan_green_ap_enable(hdd_adapter_t *pHostapdAdapter,
         v_U8_t enable);
 void hdd_wlan_green_ap_mc(hdd_context_t *pHddCtx,
diff --git a/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h b/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h
index 4c8c421e8800..ad4f7e9c727b 100644
--- a/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h
+++ b/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h
@@ -134,16 +134,6 @@ extern VOS_STATUS hdd_softap_init_tx_rx_sta( hdd_adapter_t *pAdapter, v_U8_t STA
 extern VOS_STATUS hdd_softap_deinit_tx_rx_sta ( hdd_adapter_t *pAdapter, v_U8_t STAId );
 
 /**============================================================================
-  @brief hdd_disconnect_tx_rx() - Disconnect function to clean up Tx/RX
-  modules in HDD
-
-  @param pAdapter : [in] pointer to adapter context
-  @return         : VOS_STATUS_E_FAILURE if any errors encountered
-                  : VOS_STATUS_SUCCESS otherwise
-  ===========================================================================*/
-extern VOS_STATUS hdd_softap_disconnect_tx_rx( hdd_adapter_t *pAdapter );
-
-/**============================================================================
   @brief hdd_tx_complete_cbk() - Callback function invoked by TL
   to indicate that a packet has been transmitted across the SDIO bus
   successfully. OS packet resources can be released after this cbk.
@@ -310,16 +300,6 @@ extern VOS_STATUS hdd_softap_change_STA_state( hdd_adapter_t *pAdapter, v_MACADD
   =========================================================================== */
 extern VOS_STATUS hdd_softap_GetStaId( hdd_adapter_t *pAdapter, v_MACADDR_t *pMacAddress, v_U8_t *staId);
 
-/**============================================================================
-  @brief hdd_softap_GetConnectedStaId - Helper function to get station Id of the connected device
-
-  @param pAdapter : [in] pointer to adapter context
-  @param staId    : [out] station id
-  @return         : VOS_STATUS_E_FAILURE if any errors encountered
-                  : VOS_STATUS_SUCCESS otherwise
-  =========================================================================== */
-extern VOS_STATUS hdd_softap_GetConnectedStaId( hdd_adapter_t *pAdapter, v_U8_t *staId);
-
 #ifdef QCA_LL_TX_FLOW_CT
 /**============================================================================
   @brief hdd_softap_tx_resume_timer_expired_handler() - Resume OS TX Q timer
diff --git a/CORE/HDD/inc/wlan_hdd_tdls.h b/CORE/HDD/inc/wlan_hdd_tdls.h
index 8bb257caf8ab..462b09a36c41 100644
--- a/CORE/HDD/inc/wlan_hdd_tdls.h
+++ b/CORE/HDD/inc/wlan_hdd_tdls.h
@@ -301,8 +301,6 @@ int wlan_hdd_tdls_set_rssi(hdd_adapter_t *pAdapter, u8 *mac, tANI_S8 rxRssi);
 
 int wlan_hdd_tdls_set_responder(hdd_adapter_t *pAdapter, u8 *mac, tANI_U8 responder);
 
-int wlan_hdd_tdls_get_responder(hdd_adapter_t *pAdapter, u8 *mac);
-
 int wlan_hdd_tdls_set_signature(hdd_adapter_t *pAdapter, u8 *mac, tANI_U8 uSignature);
 
 int wlan_hdd_tdls_set_params(struct net_device *dev, tdls_config_params_t *config);
@@ -325,8 +323,6 @@ void wlan_hdd_tdls_decrement_peer_count(hdd_adapter_t *pAdapter);
 
 void wlan_hdd_tdls_check_bmps(hdd_adapter_t *pAdapter);
 
-u8 wlan_hdd_tdls_is_peer_progress(hdd_adapter_t *pAdapter, u8 *mac);
-
 hddTdlsPeer_t *wlan_hdd_tdls_is_progress(hdd_context_t *pHddCtx, u8* mac, u8 skip_self);
 
 void wlan_hdd_tdls_set_mode(hdd_context_t *pHddCtx,
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 1709badfd7e6..dfc63e1e6d10 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -71,8 +71,6 @@
 #endif
 #include <vos_sched.h>
 
-v_BOOL_t mibIsDot11DesiredBssTypeInfrastructure( hdd_adapter_t *pAdapter );
-
 struct ether_addr
 {
     u_char  ether_addr_octet[6];
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 2fadaf3ed0fa..adb4c2c4a1b3 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -6597,6 +6597,8 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 
     /* Successfully started Bss update the state bit. */
     set_bit(SOFTAP_BSS_STARTED, &pHostapdAdapter->event_flags);
+    /* Initialize WMM configuation */
+    hdd_wmm_init(pHostapdAdapter);
     wlan_hdd_incr_active_session(pHddCtx, pHostapdAdapter->device_mode);
 
 #ifdef DHCP_SERVER_OFFLOAD
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index 686c54e9fb04..5381044e171c 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -1683,22 +1683,6 @@ VOS_STATUS hdd_wlan_reset_initialization(void)
    return VOS_STATUS_SUCCESS;
 }
 
-
-/*
- * Based on the ioctl command received by HDD, put WLAN driver
- * into the quiet mode. This is the same as the early suspend
- * notification that driver used to listen
- */
-void hdd_set_wlan_suspend_mode(bool suspend)
-{
-    vos_ssr_protect(__func__);
-    if (suspend)
-        hdd_suspend_wlan(NULL, NULL);
-    else
-        hdd_resume_wlan();
-    vos_ssr_unprotect(__func__);
-}
-
 static void hdd_ssr_timer_init(void)
 {
     init_timer(&ssr_timer);
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index 65705593da74..062bf19a6653 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -324,22 +324,6 @@ static void hdd_hostapd_uninit (struct net_device *dev)
    EXIT();
 }
 
-
-/**============================================================================
-  @brief hdd_hostapd_hard_start_xmit() - Function registered with the Linux OS for
-  transmitting packets. There are 2 versions of this function. One that uses
-  locked queue and other that uses lockless queues. Both have been retained to
-  do some performance testing
-  @param skb      : [in]  pointer to OS packet (sk_buff)
-  @param dev      : [in] pointer to Libra network device
-
-  @return         : NET_XMIT_DROP if packets are dropped
-                  : NET_XMIT_SUCCESS if packet is enqueued successfully
-  ===========================================================================*/
-int hdd_hostapd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
-{
-    return 0;
-}
 int hdd_hostapd_change_mtu(struct net_device *dev, int new_mtu)
 {
     return 0;
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 04af2b986d8d..a3c669a8f6d1 100755
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -56,7 +56,6 @@
 /*--------------------------------------------------------------------------
   Include Files
   ------------------------------------------------------------------------*/
-//#include <wlan_qct_driver.h>
 #include <wlan_hdd_includes.h>
 #include <vos_api.h>
 #include <vos_sched.h>
@@ -282,7 +281,6 @@ static void wlan_hdd_restart_init(hdd_context_t *pHddCtx);
 static void wlan_hdd_restart_deinit(hdd_context_t *pHddCtx);
 
 void wlan_hdd_restart_timer_cb(v_PVOID_t usrDataForCallback);
-void hdd_set_wlan_suspend_mode(bool suspend);
 
 v_U16_t hdd_select_queue(struct net_device *dev,
                          struct sk_buff *skb
@@ -454,19 +452,6 @@ int hdd_wlan_green_ap_enable(hdd_adapter_t *pHostapdAdapter,
     return ret;
 }
 
-
-boolean hdd_wlan_green_ap_is_ps_on(hdd_context_t *pHddCtx)
-{
-    hdd_green_ap_ctx_t *green_ap = pHddCtx->green_ap_ctx;
-
-    if (green_ap == NULL)
-        return FALSE;
-
-    return ((green_ap->ps_state == GREEN_AP_PS_ON_STATE)
-            && (green_ap->ps_enable));
-}
-
-
 void hdd_wlan_green_ap_mc(hdd_context_t *pHddCtx,
         hdd_green_ap_event_t event)
 {
@@ -8002,31 +7987,6 @@ void hdd_full_pwr_cbk(void *callbackContext, eHalStatus status)
 
 /**---------------------------------------------------------------------------
 
-    \brief hdd_req_bmps_cbk() - HDD Request BMPS callback function
-
-     This is the function invoked by SME to inform the result of BMPS
-     request issued by HDD
-
-    \param  - callback context - Pointer to cookie
-               status - result of request
-
-    \return - None
-
---------------------------------------------------------------------------*/
-void hdd_req_bmps_cbk(void *callbackContext, eHalStatus status)
-{
-
-   struct completion *completion_var = (struct completion*) callbackContext;
-
-   hddLog(VOS_TRACE_LEVEL_ERROR, "HDD BMPS request Callback, status = %d", status);
-   if(completion_var != NULL)
-   {
-      complete(completion_var);
-   }
-}
-
-/**---------------------------------------------------------------------------
-
   \brief hdd_get_cfg_file_size() -
 
    This function reads the configuration file using the request firmware
diff --git a/CORE/HDD/src/wlan_hdd_mib.c b/CORE/HDD/src/wlan_hdd_mib.c
deleted file mode 100644
index 9a2ccc4df01a..000000000000
--- a/CORE/HDD/src/wlan_hdd_mib.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * This file was originally distributed by Qualcomm Atheros, Inc.
- * under proprietary terms before Copyright ownership was assigned
- * to the Linux Foundation.
- */
-
-#include "wlan_hdd_includes.h"
-
-
-static inline v_VOID_t mibGetDot11DesiredBssType( hdd_adapter_t *pAdapter, eMib_dot11DesiredBssType *pDot11DesiredBssType )
-{
-    *pDot11DesiredBssType = pAdapter->hdd_mib.mibDot11DesiredBssType;
-    return;
-}
-
-static inline VOS_STATUS mibSetDot11DesiredBssType( hdd_adapter_t *pAdapter, eMib_dot11DesiredBssType mibDot11DesiredBssType )
-{
-    pAdapter->hdd_mib.mibDot11DesiredBssType = mibDot11DesiredBssType;
-    return( VOS_STATUS_SUCCESS );
-}
-
-v_BOOL_t mibIsDot11DesiredBssTypeInfrastructure( hdd_adapter_t *pAdapter )
-{
-    eMib_dot11DesiredBssType mibDot11DesiredBssType;
-    mibGetDot11DesiredBssType( pAdapter, &mibDot11DesiredBssType );
-
-    return( eMib_dot11DesiredBssType_infrastructure == mibDot11DesiredBssType );
-}
-
-
-static inline v_BOOL_t mibIsDot11DesiredBssTypeIndependent( hdd_adapter_t *pAdapter )
-{
-    eMib_dot11DesiredBssType mibDot11DesiredBssType;
-    mibGetDot11DesiredBssType( pAdapter, &mibDot11DesiredBssType );
-
-    return( eMib_dot11DesiredBssType_independent == mibDot11DesiredBssType );
-}
-
-static inline v_VOID_t mibGetDot11IbssJoinOnly( hdd_adapter_t *pAdapter, v_BOOL_t *pdot11IbssJoinOnly )
-{
-    *pdot11IbssJoinOnly = pAdapter->hdd_mib.dot11IbssJoinOnly;
-    return;
-}
-
-static inline VOS_STATUS mibSetDot11IbssJoinOnly( hdd_adapter_t *pAdapter, v_BOOL_t dot11IbssJoinOnly )
-{
-    pAdapter->hdd_mib.dot11IbssJoinOnly = dot11IbssJoinOnly;
-    return( VOS_STATUS_SUCCESS );
-}
-
-static inline VOS_STATUS mibSetDot11NICPowerState( hdd_adapter_t *pAdapter, eMib_dot11NICPowerState *pMibDot11NICPowerState )
-{
-    VOS_STATUS status = VOS_STATUS_SUCCESS;
-
-    pAdapter->hdd_mib.mibDot11NICPowerState = *pMibDot11NICPowerState;
-
-    return( status );
-}
-
-static inline VOS_STATUS mibSetDot11NICPowerStateOff( hdd_adapter_t *pAdapter )
-{
-    eMib_dot11NICPowerState dot11NICPowerState = eMib_dot11NICPowerState_OFF;
-    return( mibSetDot11NICPowerState( pAdapter, &dot11NICPowerState ) );
-}
-
-static inline void mibGetDot11NICPowerState( hdd_adapter_t *pAdapter, eMib_dot11NICPowerState *pMibDot11NICPowerState )
-{
-    *pMibDot11NICPowerState = pAdapter->hdd_mib.mibDot11NICPowerState;
-
-    return;
-}
-
-static inline v_BOOL_t mibIsDot11NICPowerStateOn( hdd_adapter_t *pAdapter )
-{
-    eMib_dot11NICPowerState dot11NICPowerState;
-
-    mibGetDot11NICPowerState( pAdapter, &dot11NICPowerState );
-
-    return( eMib_dot11NICPowerState_ON == dot11NICPowerState );
-}
-
-static inline v_BOOL_t mibIsDot11NICPowerStateOff( hdd_adapter_t *pAdapter )
-{
-    return( !mibIsDot11NICPowerStateOn( pAdapter ) );
-}
-
-static inline VOS_STATUS mibSetDot11DesiredSsidList( hdd_adapter_t *pAdapter, sMib_dot11DesiredSsidList *pDot11DesiredSsidList )
-{
-    VOS_STATUS status = VOS_STATUS_SUCCESS;
-
-    if ( pDot11DesiredSsidList->cEntries > MIB_DOT11_DESIRED_SSID_LIST_MAX_COUNT )
-
-        pAdapter->hdd_mib.mibDot11DesiredSsidList = *pDot11DesiredSsidList ;
-
-    return( status );
-}
-
-static inline VOS_STATUS mibSetDot11DesiredBssidList( hdd_adapter_t *pAdapter, sMib_dot11DesiredBssidList *pDot11DesiredBssidList )
-{
-    pAdapter->hdd_mib.mibDot11DesiredBssidList = *pDot11DesiredBssidList;
-
-    return( VOS_STATUS_SUCCESS );
-}
-
-
-static inline v_VOID_t mibGetDot11DesiredBssidList( hdd_adapter_t *pAdapter, sMib_dot11DesiredBssidList *pMibDot11DesiredBssidList )
-{
-    *pMibDot11DesiredBssidList = pAdapter->hdd_mib.mibDot11DesiredBssidList;
-
-    return;
-}
-
-
-static inline v_VOID_t mibGetDot11DesiredSsidList( hdd_adapter_t *pAdapter, sMib_dot11DesiredSsidList *pMibDot11DesiredSsidList )
-{
-    *pMibDot11DesiredSsidList = pAdapter->hdd_mib.mibDot11DesiredSsidList;
-
-    return;
-}
-
-
-static inline VOS_STATUS mibSetDot11AutoConfigEnabled( hdd_adapter_t *pAdapter, eMib_dot11AutoConfigEnabled *pMibDot11AutoConfigEnabled )
-{
-    VOS_STATUS status = VOS_STATUS_SUCCESS;
-
-    pAdapter->hdd_mib.mibDot11AutoConfigEnabled = *pMibDot11AutoConfigEnabled;
-
-    return( status );
-}
-
-
-static inline v_VOID_t mibGetDot11AutoConfigEnabled( hdd_adapter_t *pAdapter, eMib_dot11AutoConfigEnabled *pMibDot11AutoConfigEnabled )
-{
-    *pMibDot11AutoConfigEnabled = pAdapter->hdd_mib.mibDot11AutoConfigEnabled;
-
-    return;
-}
-
-static inline VOS_STATUS mibSetDot11MacExcludeList( hdd_adapter_t *pAdapter, sMib_dot11MacExcludeList *pDot11MacExcludeList )
-{
-    pAdapter->hdd_mib.mibDot11MacExcludeList = *pDot11MacExcludeList;
-
-    return( VOS_STATUS_SUCCESS );
-}
-
-static inline VOS_STATUS mibGetDot11MacExcludeList( hdd_adapter_t *pAdapter, sMib_dot11MacExcludeList *pDot11MacExcludeList )
-{
-    *pDot11MacExcludeList =  pAdapter->hdd_mib.mibDot11MacExcludeList;
-
-    return( VOS_STATUS_SUCCESS );
-}
-
-static inline void mibSetDefaultDot11MacExcludeList( hdd_adapter_t *pAdapter )
-{
-    pAdapter->hdd_mib.mibDot11MacExcludeList.cEntries = 0;
-}
-
-static inline VOS_STATUS mibSetDot11HardwarePHYState( hdd_adapter_t *pAdapter, eMib_dot11HardwarePHYState *pMibDot11HardwarePHYState )
-{
-    VOS_STATUS status = VOS_STATUS_SUCCESS;
-
-    pAdapter->hdd_mib.mibDot11HardwarePHYState = *pMibDot11HardwarePHYState;
-
-    return( status );
-}
-
-
-static inline void mibGetDot11HardwarePHYState( hdd_adapter_t *pAdapter, eMib_dot11HardwarePHYState *pMibDot11HardwarePHYState )
-{
-    *pMibDot11HardwarePHYState = pAdapter->hdd_mib.mibDot11HardwarePHYState;
-
-    return;
-}
-
-static inline void mibSetDefaultDot11PrivacyExemptionList( hdd_adapter_t *pAdapter )
-{
-    pAdapter->hdd_mib.mibDot11PrivacyExemptionList.cEntries = 0;
-}
-
-
-static inline void mibGetDot11PowerSavingLevel( hdd_adapter_t *pAdapter, eMib_dot11PowerSavingLevel *pMibDot11PowerSavingLevel )
-{
-    *pMibDot11PowerSavingLevel = pAdapter->hdd_mib.mibDot11PowerSavingLevel;
-
-    return;
-}
-
-
-static inline void mibGetDevicePowerState( hdd_adapter_t *pAdapter, eMib_DevicePowerState *pMibDevicePowerState )
-{
-    *pMibDevicePowerState = pAdapter->hdd_mib.mibDevicePowerState;
-
-    return;
-}
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index 4b10dc040bbf..7004c624522c 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -55,7 +55,7 @@
 #include "vos_sched.h"
 
 //Ms to Micro Sec
-#define MS_TO_MUS(x)   ((x)*1000);
+#define MS_TO_MUS(x)   ((x)*1000)
 
 tANI_U8* hdd_getActionString( tANI_U16 MsgType )
 {
diff --git a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
index b375e9ba5cde..f5b3f05796b2 100644
--- a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
@@ -44,7 +44,6 @@
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <linux/etherdevice.h>
-//#include <vos_list.h>
 #include <vos_types.h>
 #include <aniGlobal.h>
 #include <halTypes.h>
@@ -84,8 +83,6 @@ static void hdd_softap_dump_sk_buff(struct sk_buff * skb)
 }
 #endif
 
-extern void hdd_set_wlan_suspend_mode(bool suspend);
-
 /**============================================================================
   @brief hdd_softap_flush_tx_queues() - Utility function to flush the TX queues
 
@@ -792,19 +789,6 @@ VOS_STATUS hdd_softap_deinit_tx_rx_sta ( hdd_adapter_t *pAdapter, v_U8_t STAId )
 }
 
 /**============================================================================
-  @brief hdd_softap_disconnect_tx_rx() - Disconnect function to clean up Tx/RX
-  modules in HDD
-
-  @param pAdapter : [in] pointer to adapter context
-  @return         : VOS_STATUS_E_FAILURE if any errors encountered
-                  : VOS_STATUS_SUCCESS otherwise
-  ===========================================================================*/
-VOS_STATUS hdd_softap_disconnect_tx_rx( hdd_adapter_t *pAdapter )
-{
-   return hdd_softap_flush_tx_queues(pAdapter);
-}
-
-/**============================================================================
   @brief hdd_softap_tx_complete_cbk() - Callback function invoked by TL
   to indicate that a packet has been transmitted across the bus
   successfully. OS packet resources can be released after this cbk.
@@ -1643,19 +1627,3 @@ VOS_STATUS hdd_softap_GetStaId(hdd_adapter_t *pAdapter, v_MACADDR_t *pMacAddress
     return VOS_STATUS_E_FAILURE;
 }
 
-VOS_STATUS hdd_softap_GetConnectedStaId(hdd_adapter_t *pAdapter, v_U8_t *staId)
-{
-    v_U8_t i;
-
-    for (i = 0; i < WLAN_MAX_STA_COUNT; i++)
-    {
-        if (pAdapter->aStaInfo[i].isUsed &&
-            (!vos_is_macaddr_broadcast(&pAdapter->aStaInfo[i].macAddrSTA)))
-        {
-            *staId = i;
-            return VOS_STATUS_SUCCESS;
-        }
-    }
-
-    return VOS_STATUS_E_FAILURE;
-}
diff --git a/CORE/HDD/src/wlan_hdd_tdls.c b/CORE/HDD/src/wlan_hdd_tdls.c
index 8b8e1630deaa..3644c8ee6356 100644
--- a/CORE/HDD/src/wlan_hdd_tdls.c
+++ b/CORE/HDD/src/wlan_hdd_tdls.c
@@ -1238,21 +1238,6 @@ int wlan_hdd_tdls_set_responder(hdd_adapter_t *pAdapter, u8 *mac, tANI_U8 respon
     return 0;
 }
 
-int wlan_hdd_tdls_get_responder(hdd_adapter_t *pAdapter, u8 *mac)
-{
-    hddTdlsPeer_t *curr_peer;
-
-    curr_peer = wlan_hdd_tdls_find_peer(pAdapter, mac, TRUE);
-    if (curr_peer == NULL)
-    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 FL("curr_peer is NULL"));
-       return -1;
-    }
-
-    return (curr_peer->is_responder);
-}
-
 int wlan_hdd_tdls_set_signature(hdd_adapter_t *pAdapter, u8 *mac, tANI_U8 uSignature)
 {
     hddTdlsPeer_t *curr_peer;
@@ -2020,21 +2005,6 @@ void wlan_hdd_tdls_check_bmps(hdd_adapter_t *pAdapter)
     return;
 }
 
-u8 wlan_hdd_tdls_is_peer_progress(hdd_adapter_t *pAdapter, u8 *mac)
-{
-    hddTdlsPeer_t *curr_peer;
-
-    curr_peer = wlan_hdd_tdls_find_peer(pAdapter, mac, TRUE);
-    if (curr_peer == NULL)
-    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                FL("curr_peer is NULL"));
-       return 0;
-    }
-
-    return (eTDLS_LINK_CONNECTING == curr_peer->link_status);
-}
-
 /* return pointer to hddTdlsPeer_t if TDLS is ongoing. Otherwise return NULL.
  * mac - if NULL check for all the peer list, otherwise, skip this mac when skip_self is TRUE
  * skip_self - if TRUE, skip this mac. otherwise, check all the peer list. if
diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h
index 04d89e281970..6eb4b3daccb3 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            236
+#define QWLAN_VERSION_BUILD            237
 
-#define QWLAN_VERSIONSTR               "1.0.0.236"
+#define QWLAN_VERSIONSTR               "1.0.0.237"
 
 
 #define AR6320_REV1_VERSION             0x5000000
diff --git a/Kbuild b/Kbuild
index 22f55db734a2..e5acdfeef9db 100644
--- a/Kbuild
+++ b/Kbuild
@@ -331,7 +331,6 @@ HDD_OBJS := 	$(HDD_SRC_DIR)/wlan_hdd_assoc.o \
 		$(HDD_SRC_DIR)/wlan_hdd_ftm.o \
 		$(HDD_SRC_DIR)/wlan_hdd_hostapd.o \
 		$(HDD_SRC_DIR)/wlan_hdd_main.o \
-		$(HDD_SRC_DIR)/wlan_hdd_mib.o \
 		$(HDD_SRC_DIR)/wlan_hdd_oemdata.o \
 		$(HDD_SRC_DIR)/wlan_hdd_scan.o \
 		$(HDD_SRC_DIR)/wlan_hdd_softap_tx_rx.o \