wlan: Fixing misleading HDD API names
As part of driver code cleanup for STA + STA concurrency support,
fixing some of HDD API names which were misleading. Register and
Deregister frames have been named as preVoss and postVoss start
which doesn't make any sense
CRs-Fixed: 669645
Change-Id: I3fd848ffedfd0cd41d4a01de4113df299bae3f06
diff --git a/CORE/HDD/inc/wlan_hdd_cfg80211.h b/CORE/HDD/inc/wlan_hdd_cfg80211.h
index 7da219e..ed1a2e7 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg80211.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg80211.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -183,10 +183,9 @@
);
int wlan_hdd_cfg80211_register( struct wiphy *wiphy);
-void wlan_hdd_cfg80211_post_voss_start(hdd_adapter_t* pAdapter);
+void wlan_hdd_cfg80211_register_frames(hdd_adapter_t* pAdapter);
-void wlan_hdd_cfg80211_pre_voss_stop(hdd_adapter_t* pAdapter);
-
+void wlan_hdd_cfg80211_deregister_frames(hdd_adapter_t* pAdapter);
#ifdef CONFIG_ENABLE_LINUX_REG
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
void wlan_hdd_linux_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request);
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index dc167d3..5ddda96 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -925,11 +925,8 @@
}
}
-/* In this function we will do all post VOS start initialization.
- In this function we will register for all frame in which supplicant
- is interested.
-*/
-void wlan_hdd_cfg80211_post_voss_start(hdd_adapter_t* pAdapter)
+/* This function registers for all frame which supplicant is interested in */
+void wlan_hdd_cfg80211_register_frames(hdd_adapter_t* pAdapter)
{
tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
/* Register for all P2P action, public action etc frames */
@@ -977,7 +974,7 @@
WNM_NOTIFICATION_FRAME_SIZE );
}
-void wlan_hdd_cfg80211_pre_voss_stop(hdd_adapter_t* pAdapter)
+void wlan_hdd_cfg80211_deregister_frames(hdd_adapter_t* pAdapter)
{
tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
/* Register for all P2P action, public action etc frames */
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 2f8a1b9..9efc8b2 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -7522,7 +7522,7 @@
if (pAdapter != NULL)
{
- wlan_hdd_cfg80211_pre_voss_stop(pAdapter);
+ wlan_hdd_cfg80211_deregister_frames(pAdapter);
hdd_UnregisterWext(pAdapter->dev);
}
}
@@ -8898,7 +8898,7 @@
/* Action frame registered in one adapter which will
* applicable to all interfaces
*/
- wlan_hdd_cfg80211_post_voss_start(pAdapter);
+ wlan_hdd_cfg80211_register_frames(pAdapter);
}
mutex_init(&pHddCtx->sap_lock);