[PATCH 01/30] staging: wilc1000: rename WILC_WFI_CfgSetChannel

[PATCH 01/30] staging: wilc1000: rename WILC_WFI_CfgSetChannel

[Chaehyun Lim]

This patch replaces WILC_WFI_CfgSetChannel with
wilc_cfg80211_set_monitor_channel to avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 75e1687..585ea5e 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -677,7 +677,7 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent,
 
 
 /**
- *  @brief      WILC_WFI_CfgSetChannel
+ *  @brief      wilc_cfg80211_set_monitor_channel
  *  @details    Set channel for a given wireless interface. Some devices
  *                      may support multi-channel operation (by channel hopping) so cfg80211
  *                      doesn't verify much. Note, however, that the passed netdev may be
@@ -689,7 +689,7 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent,
  *  @date	01 MAR 2012
  *  @version	1.0
  */
-static int WILC_WFI_CfgSetChannel(struct wiphy *wiphy,
+static int wilc_cfg80211_set_monitor_channel(struct wiphy *wiphy,
 				  struct cfg80211_chan_def *chandef)
 {
 
@@ -3229,7 +3229,7 @@ static int WILC_WFI_start_ap(struct wiphy *wiphy, struct net_device *dev,
 	PRINT_D(HOSTAPD_DBG, "Interval = %d\n DTIM period = %d\n Head length = %zu Tail length = %zu\n",
 		settings->beacon_interval, settings->dtim_period, beacon->head_len, beacon->tail_len);
 
-	s32Error = WILC_WFI_CfgSetChannel(wiphy, &settings->chandef);
+	s32Error = wilc_cfg80211_set_monitor_channel(wiphy, &settings->chandef);
 
 	if (s32Error != WILC_SUCCESS)
 		PRINT_ER("Error in setting channel\n");
@@ -3603,7 +3603,7 @@ int WILC_WFI_del_virt_intf(struct wiphy *wiphy, struct wireless_dev *wdev)
 #endif /*WILC_AP_EXTERNAL_MLME*/
 static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 
-	.set_monitor_channel = WILC_WFI_CfgSetChannel,
+	.set_monitor_channel = wilc_cfg80211_set_monitor_channel,
 	.scan = WILC_WFI_CfgScan,
 	.connect = WILC_WFI_CfgConnect,
 	.disconnect = WILC_WFI_disconnect,
-- 
2.5.1

[PATCH 02/30] staging: wilc1000: rename WILC_WFI_CfgScan

[Chaehyun Lim]

This patch replaces WILC_WFI_CfgScan with wilc_cfg80211_scan to avoid
CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 585ea5e..087f36e 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -712,7 +712,7 @@ static int wilc_cfg80211_set_monitor_channel(struct wiphy *wiphy,
 }
 
 /**
- *  @brief      WILC_WFI_CfgScan
+ *  @brief      wilc_cfg80211_scan
  *  @details    Request to do a scan. If returning zero, the scan request is given
  *                      the driver, and will be valid until passed to cfg80211_scan_done().
  *                      For scan results, call cfg80211_inform_bss(); you can call this outside
@@ -728,7 +728,7 @@ static int wilc_cfg80211_set_monitor_channel(struct wiphy *wiphy,
  *	kernel version 3.8.8 supported
  *	tony, sswd, WILC-KR, 2013-10-29
  */
-static int WILC_WFI_CfgScan(struct wiphy *wiphy, struct cfg80211_scan_request *request)
+static int wilc_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)
 {
 	struct WILC_WFI_priv *priv;
 	u32 i;
@@ -3604,7 +3604,7 @@ int WILC_WFI_del_virt_intf(struct wiphy *wiphy, struct wireless_dev *wdev)
 static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 
 	.set_monitor_channel = wilc_cfg80211_set_monitor_channel,
-	.scan = WILC_WFI_CfgScan,
+	.scan = wilc_cfg80211_scan,
 	.connect = WILC_WFI_CfgConnect,
 	.disconnect = WILC_WFI_disconnect,
 	.add_key = WILC_WFI_add_key,
-- 
2.5.1

[PATCH 03/30] staging: wilc1000: rename WILC_WFI_CfgConnect

[Chaehyun Lim]

This patch replaces WILC_WFI_CfgConnect with wilc_cfg80211_connect to
avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 087f36e..563841f 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -806,7 +806,7 @@ static int wilc_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request
 }
 
 /**
- *  @brief      WILC_WFI_CfgConnect
+ *  @brief      wilc_cfg80211_connect
  *  @details    Connect to the ESS with the specified parameters. When connected,
  *                      call cfg80211_connect_result() with status code %WLAN_STATUS_SUCCESS.
  *                      If the connection fails for some reason, call cfg80211_connect_result()
@@ -817,7 +817,7 @@ static int wilc_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request
  *  @date	01 MAR 2012
  *  @version	1.0
  */
-static int WILC_WFI_CfgConnect(struct wiphy *wiphy, struct net_device *dev,
+static int wilc_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
 			       struct cfg80211_connect_params *sme)
 {
 	s32 s32Error = WILC_SUCCESS;
@@ -3605,7 +3605,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 
 	.set_monitor_channel = wilc_cfg80211_set_monitor_channel,
 	.scan = wilc_cfg80211_scan,
-	.connect = WILC_WFI_CfgConnect,
+	.connect = wilc_cfg80211_connect,
 	.disconnect = WILC_WFI_disconnect,
 	.add_key = WILC_WFI_add_key,
 	.del_key = WILC_WFI_del_key,
-- 
2.5.1

[PATCH 04/30] staging: wilc1000: rename WILC_WFI_add_key

[Chaehyun Lim]

This patch replaces WILC_WFI_add_key with wilc_cfg80211_add_key to avoid
CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 563841f..0714034 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1112,7 +1112,7 @@ static int WILC_WFI_disconnect(struct wiphy *wiphy, struct net_device *dev, u16
 }
 
 /**
- *  @brief      WILC_WFI_add_key
+ *  @brief      wilc_cfg80211_add_key
  *  @details    Add a key with the given parameters. @mac_addr will be %NULL
  *                      when adding a group key.
  *  @param[in] key : key buffer; TKIP: 16-byte temporal key, 8-byte Tx Mic key, 8-byte Rx Mic Key
@@ -1121,7 +1121,7 @@ static int WILC_WFI_disconnect(struct wiphy *wiphy, struct net_device *dev, u16
  *  @date	01 MAR 2012
  *  @version	1.0
  */
-static int WILC_WFI_add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
+static int wilc_cfg80211_add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
 			    bool pairwise,
 			    const u8 *mac_addr, struct key_params *params)
 
@@ -2932,14 +2932,14 @@ static int WILC_WFI_change_virt_intf(struct wiphy *wiphy, struct net_device *dev
 				PRINT_D(CFG80211_DBG, "gtk %x %x %x\n", g_key_gtk_params.key[0],
 					g_key_gtk_params.key[1],
 					g_key_gtk_params.key[2]);
-				WILC_WFI_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy,
+				wilc_cfg80211_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy,
 						 g_linux_wlan->strInterfaceInfo[0].wilc_netdev,
 						 g_add_ptk_key_params.key_idx,
 						 g_add_ptk_key_params.pairwise,
 						 g_add_ptk_key_params.mac_addr,
 						 (struct key_params *)(&g_key_ptk_params));
 
-				WILC_WFI_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy,
+				wilc_cfg80211_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy,
 						 g_linux_wlan->strInterfaceInfo[0].wilc_netdev,
 						 g_add_gtk_key_params.key_idx,
 						 g_add_gtk_key_params.pairwise,
@@ -3018,14 +3018,14 @@ static int WILC_WFI_change_virt_intf(struct wiphy *wiphy, struct net_device *dev
 				PRINT_D(CFG80211_DBG, "gtk %x %x %x\n", g_key_gtk_params.key[0],
 					g_key_gtk_params.key[1],
 					g_key_gtk_params.key[2]);
-				WILC_WFI_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy,
+				wilc_cfg80211_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy,
 						 g_linux_wlan->strInterfaceInfo[0].wilc_netdev,
 						 g_add_ptk_key_params.key_idx,
 						 g_add_ptk_key_params.pairwise,
 						 g_add_ptk_key_params.mac_addr,
 						 (struct key_params *)(&g_key_ptk_params));
 
-				WILC_WFI_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy,
+				wilc_cfg80211_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy,
 						 g_linux_wlan->strInterfaceInfo[0].wilc_netdev,
 						 g_add_gtk_key_params.key_idx,
 						 g_add_gtk_key_params.pairwise,
@@ -3149,14 +3149,14 @@ static int WILC_WFI_change_virt_intf(struct wiphy *wiphy, struct net_device *dev
 				g_key_gtk_params.key[2],
 				g_key_gtk_params.cipher);
 			#if 1
-			WILC_WFI_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy,
+			wilc_cfg80211_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy,
 					 g_linux_wlan->strInterfaceInfo[0].wilc_netdev,
 					 g_add_ptk_key_params.key_idx,
 					 g_add_ptk_key_params.pairwise,
 					 g_add_ptk_key_params.mac_addr,
 					 (struct key_params *)(&g_key_ptk_params));
 
-			WILC_WFI_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy,
+			wilc_cfg80211_add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy,
 					 g_linux_wlan->strInterfaceInfo[0].wilc_netdev,
 					 g_add_gtk_key_params.key_idx,
 					 g_add_gtk_key_params.pairwise,
@@ -3607,7 +3607,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	.scan = wilc_cfg80211_scan,
 	.connect = wilc_cfg80211_connect,
 	.disconnect = WILC_WFI_disconnect,
-	.add_key = WILC_WFI_add_key,
+	.add_key = wilc_cfg80211_add_key,
 	.del_key = WILC_WFI_del_key,
 	.get_key = WILC_WFI_get_key,
 	.set_default_key = WILC_WFI_set_default_key,
-- 
2.5.1

[PATCH 05/30] staging: wilc1000: rename WILC_WFI_del_key

[Chaehyun Lim]

This patch replaces WILC_WFI_del_key with wilc_cfg80211_del_key to avoid
CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 0714034..1e08b0c 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1403,7 +1403,7 @@ static int wilc_cfg80211_add_key(struct wiphy *wiphy, struct net_device *netdev,
 }
 
 /**
- *  @brief      WILC_WFI_del_key
+ *  @brief      wilc_cfg80211_del_key
  *  @details    Remove a key given the @mac_addr (%NULL for a group key)
  *                      and @key_index, return -ENOENT if the key doesn't exist.
  *  @param[in]
@@ -1412,7 +1412,7 @@ static int wilc_cfg80211_add_key(struct wiphy *wiphy, struct net_device *netdev,
  *  @date	01 MAR 2012
  *  @version	1.0
  */
-static int WILC_WFI_del_key(struct wiphy *wiphy, struct net_device *netdev,
+static int wilc_cfg80211_del_key(struct wiphy *wiphy, struct net_device *netdev,
 			    u8 key_index,
 			    bool pairwise,
 			    const u8 *mac_addr)
@@ -3608,7 +3608,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	.connect = wilc_cfg80211_connect,
 	.disconnect = WILC_WFI_disconnect,
 	.add_key = wilc_cfg80211_add_key,
-	.del_key = WILC_WFI_del_key,
+	.del_key = wilc_cfg80211_del_key,
 	.get_key = WILC_WFI_get_key,
 	.set_default_key = WILC_WFI_set_default_key,
 	#ifdef WILC_AP_EXTERNAL_MLME
-- 
2.5.1

[PATCH 06/30] staging: wilc1000: rename WILC_WFI_get_key

[Chaehyun Lim]

This patch replaces WILC_WFI_get_key with wilc_cfg80211_get_key to avoid
CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 1e08b0c..67a6cfb 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1511,7 +1511,7 @@ static int wilc_cfg80211_del_key(struct wiphy *wiphy, struct net_device *netdev,
 }
 
 /**
- *  @brief      WILC_WFI_get_key
+ *  @brief      wilc_cfg80211_get_key
  *  @details    Get information about the key with the given parameters.
  *                      @mac_addr will be %NULL when requesting information for a group
  *                      key. All pointers given to the @callback function need not be valid
@@ -1523,7 +1523,7 @@ static int wilc_cfg80211_del_key(struct wiphy *wiphy, struct net_device *netdev,
  *  @date	01 MAR 2012
  *  @version	1.0
  */
-static int WILC_WFI_get_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
+static int wilc_cfg80211_get_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
 			    bool pairwise,
 			    const u8 *mac_addr, void *cookie, void (*callback)(void *cookie, struct key_params *))
 {
@@ -3609,7 +3609,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	.disconnect = WILC_WFI_disconnect,
 	.add_key = wilc_cfg80211_add_key,
 	.del_key = wilc_cfg80211_del_key,
-	.get_key = WILC_WFI_get_key,
+	.get_key = wilc_cfg80211_get_key,
 	.set_default_key = WILC_WFI_set_default_key,
 	#ifdef WILC_AP_EXTERNAL_MLME
 	.add_virtual_intf = WILC_WFI_add_virt_intf,
-- 
2.5.1

[PATCH 07/30] staging: wilc1000: rename WILC_WFI_set_default_key

[Chaehyun Lim]

This patch replaces WILC_WFI_set_default_key with
wilc_cfg80211_set_default_key to avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 67a6cfb..0ac9acb 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1566,7 +1566,7 @@ static int wilc_cfg80211_get_key(struct wiphy *wiphy, struct net_device *netdev,
 }
 
 /**
- *  @brief      WILC_WFI_set_default_key
+ *  @brief      wilc_cfg80211_set_default_key
  *  @details    Set the default management frame key on an interface
  *  @param[in]
  *  @return     int : Return 0 on Success.
@@ -1574,7 +1574,7 @@ static int wilc_cfg80211_get_key(struct wiphy *wiphy, struct net_device *netdev,
  *  @date	01 MAR 2012
  *  @version	1.0
  */
-static int WILC_WFI_set_default_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
+static int wilc_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
 				    bool unicast, bool multicast)
 {
 	s32 s32Error = WILC_SUCCESS;
@@ -3610,7 +3610,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	.add_key = wilc_cfg80211_add_key,
 	.del_key = wilc_cfg80211_del_key,
 	.get_key = wilc_cfg80211_get_key,
-	.set_default_key = WILC_WFI_set_default_key,
+	.set_default_key = wilc_cfg80211_set_default_key,
 	#ifdef WILC_AP_EXTERNAL_MLME
 	.add_virtual_intf = WILC_WFI_add_virt_intf,
 	.del_virtual_intf = WILC_WFI_del_virt_intf,
-- 
2.5.1

[PATCH 08/30] staging: wilc1000: rename WILC_WFI_add_virt_intf

[Chaehyun Lim]

This patch replaces WILC_WFI_add_virt_intf with
wilc_cfg80211_add_virtual_intf to avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 0ac9acb..9c22c19 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3543,7 +3543,7 @@ static int WILC_WFI_change_station(struct wiphy *wiphy, struct net_device *dev,
 
 
 /**
- *  @brief      WILC_WFI_add_virt_intf
+ *  @brief      wilc_cfg80211_add_virtual_intf
  *  @details
  *  @param[in]
  *  @return     int : Return 0 on Success.
@@ -3551,7 +3551,7 @@ static int WILC_WFI_change_station(struct wiphy *wiphy, struct net_device *dev,
  *  @date	01 JUL 2012
  *  @version	1.0
  */
-struct wireless_dev *WILC_WFI_add_virt_intf(struct wiphy *wiphy, const char *name,
+struct wireless_dev *wilc_cfg80211_add_virtual_intf(struct wiphy *wiphy, const char *name,
 						unsigned char name_assign_type,
 						enum nl80211_iftype type, u32 *flags,
 						struct vif_params *params)
@@ -3612,7 +3612,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	.get_key = wilc_cfg80211_get_key,
 	.set_default_key = wilc_cfg80211_set_default_key,
 	#ifdef WILC_AP_EXTERNAL_MLME
-	.add_virtual_intf = WILC_WFI_add_virt_intf,
+	.add_virtual_intf = wilc_cfg80211_add_virtual_intf,
 	.del_virtual_intf = WILC_WFI_del_virt_intf,
 	.change_virtual_intf = WILC_WFI_change_virt_intf,
 
-- 
2.5.1

[PATCH 09/30] staging: wilc1000: rename WILC_WFI_del_virt_intf

[Chaehyun Lim]

This patch replaces WILC_WFI_del_virt_intf with
wilc_cfg80211_del_virtual_intf to avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 9c22c19..cffe4b4 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3584,7 +3584,7 @@ struct wireless_dev *wilc_cfg80211_add_virtual_intf(struct wiphy *wiphy, const c
 }
 
 /**
- *  @brief      WILC_WFI_del_virt_intf
+ *  @brief      wilc_cfg80211_del_virtual_intf
  *  @details
  *  @param[in]
  *  @return     int : Return 0 on Success.
@@ -3592,7 +3592,7 @@ struct wireless_dev *wilc_cfg80211_add_virtual_intf(struct wiphy *wiphy, const c
  *  @date	01 JUL 2012
  *  @version	1.0
  */
-int WILC_WFI_del_virt_intf(struct wiphy *wiphy, struct wireless_dev *wdev)      /* tony for v3.8 support */
+int wilc_cfg80211_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)      /* tony for v3.8 support */
 {
 	PRINT_D(HOSTAPD_DBG, "Deleting virtual interface\n");
 	return WILC_SUCCESS;
@@ -3613,7 +3613,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	.set_default_key = wilc_cfg80211_set_default_key,
 	#ifdef WILC_AP_EXTERNAL_MLME
 	.add_virtual_intf = wilc_cfg80211_add_virtual_intf,
-	.del_virtual_intf = WILC_WFI_del_virt_intf,
+	.del_virtual_intf = wilc_cfg80211_del_virtual_intf,
 	.change_virtual_intf = WILC_WFI_change_virt_intf,
 
 	.start_ap = WILC_WFI_start_ap,
-- 
2.5.1

[PATCH 10/30] staging: wilc1000: rename WILC_WFI_change_virt_intf

[Chaehyun Lim]

This patch replaces WILC_WFI_change_virt_intf with
wilc_cfg80211_change_virtual_intf to avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index cffe4b4..97a7a4b 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2826,7 +2826,7 @@ int WILC_WFI_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
 }
 #ifdef WILC_AP_EXTERNAL_MLME
 /**
- *  @brief      WILC_WFI_change_virt_intf
+ *  @brief      wilc_cfg80211_change_virtual_intf
  *  @details    Change type/configuration of virtual interface,
  *                      keep the struct wireless_dev's iftype updated.
  *  @param[in]   NONE
@@ -2838,7 +2838,7 @@ int WILC_WFI_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
 void wilc1000_wlan_deinit(linux_wlan_t *nic);
 int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic);
 
-static int WILC_WFI_change_virt_intf(struct wiphy *wiphy, struct net_device *dev,
+static int wilc_cfg80211_change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
 				     enum nl80211_iftype type, u32 *flags, struct vif_params *params)
 {
 	s32 s32Error = WILC_SUCCESS;
@@ -3614,7 +3614,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	#ifdef WILC_AP_EXTERNAL_MLME
 	.add_virtual_intf = wilc_cfg80211_add_virtual_intf,
 	.del_virtual_intf = wilc_cfg80211_del_virtual_intf,
-	.change_virtual_intf = WILC_WFI_change_virt_intf,
+	.change_virtual_intf = wilc_cfg80211_change_virtual_intf,
 
 	.start_ap = WILC_WFI_start_ap,
 	.change_beacon = WILC_WFI_change_beacon,
-- 
2.5.1

[PATCH 11/30] staging: wilc1000: rename WILC_WFI_start_ap

[Chaehyun Lim]

This patch replaces WILC_WFI_start_ap with wilc_cfg80211_start_ap to
avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 97a7a4b..b5d512e0 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3205,7 +3205,7 @@ static int wilc_cfg80211_change_virtual_intf(struct wiphy *wiphy, struct net_dev
  */
 
 /**
- *  @brief      WILC_WFI_start_ap
+ *  @brief      wilc_cfg80211_start_ap
  *  @details    Add a beacon with given parameters, @head, @interval
  *                      and @dtim_period will be valid, @tail is optional.
  *  @param[in]   wiphy
@@ -3216,7 +3216,7 @@ static int wilc_cfg80211_change_virtual_intf(struct wiphy *wiphy, struct net_dev
  *  @date	23 JUL 2013
  *  @version	1.0
  */
-static int WILC_WFI_start_ap(struct wiphy *wiphy, struct net_device *dev,
+static int wilc_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
 			     struct cfg80211_ap_settings *settings)
 {
 	struct cfg80211_beacon_data *beacon = &(settings->beacon);
@@ -3616,7 +3616,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	.del_virtual_intf = wilc_cfg80211_del_virtual_intf,
 	.change_virtual_intf = wilc_cfg80211_change_virtual_intf,
 
-	.start_ap = WILC_WFI_start_ap,
+	.start_ap = wilc_cfg80211_start_ap,
 	.change_beacon = WILC_WFI_change_beacon,
 	.stop_ap = WILC_WFI_stop_ap,
 	.add_station = WILC_WFI_add_station,
-- 
2.5.1

[PATCH 12/30] staging: wilc1000: rename WILC_WFI_change_beacon

[Chaehyun Lim]

This patch replaces WILC_WFI_change_beacon with
wilc_cfg80211_change_beacon to avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index b5d512e0..8773f16 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3254,7 +3254,7 @@ static int wilc_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
 }
 
 /**
- *  @brief      WILC_WFI_change_beacon
+ *  @brief      wilc_cfg80211_change_beacon
  *  @details    Add a beacon with given parameters, @head, @interval
  *                      and @dtim_period will be valid, @tail is optional.
  *  @param[in]   wiphy
@@ -3265,7 +3265,7 @@ static int wilc_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
  *  @date	23 JUL 2013
  *  @version	1.0
  */
-static int  WILC_WFI_change_beacon(struct wiphy *wiphy, struct net_device *dev,
+static int  wilc_cfg80211_change_beacon(struct wiphy *wiphy, struct net_device *dev,
 				   struct cfg80211_beacon_data *beacon)
 {
 	struct WILC_WFI_priv *priv;
@@ -3617,7 +3617,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	.change_virtual_intf = wilc_cfg80211_change_virtual_intf,
 
 	.start_ap = wilc_cfg80211_start_ap,
-	.change_beacon = WILC_WFI_change_beacon,
+	.change_beacon = wilc_cfg80211_change_beacon,
 	.stop_ap = WILC_WFI_stop_ap,
 	.add_station = WILC_WFI_add_station,
 	.del_station = WILC_WFI_del_station,
-- 
2.5.1

[PATCH 13/30] staging: wilc1000: rename WILC_WFI_stop_ap

[Chaehyun Lim]

This patch replaces WILC_WFI_stop_ap with wilc_cfg80211_stop_ap to avoid
CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 8773f16..c190d8b 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3293,7 +3293,7 @@ static int  wilc_cfg80211_change_beacon(struct wiphy *wiphy, struct net_device *
 }
 
 /**
- *  @brief      WILC_WFI_stop_ap
+ *  @brief      wilc_cfg80211_stop_ap
  *  @details    Remove beacon configuration and stop sending the beacon.
  *  @param[in]
  *  @return     int : Return 0 on Success.
@@ -3301,7 +3301,7 @@ static int  wilc_cfg80211_change_beacon(struct wiphy *wiphy, struct net_device *
  *  @date	23 JUL 2013
  *  @version	1.0
  */
-static int  WILC_WFI_stop_ap(struct wiphy *wiphy, struct net_device *dev)
+static int  wilc_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
 {
 	s32 s32Error = WILC_SUCCESS;
 	struct WILC_WFI_priv *priv;
@@ -3618,7 +3618,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 
 	.start_ap = wilc_cfg80211_start_ap,
 	.change_beacon = wilc_cfg80211_change_beacon,
-	.stop_ap = WILC_WFI_stop_ap,
+	.stop_ap = wilc_cfg80211_stop_ap,
 	.add_station = WILC_WFI_add_station,
 	.del_station = WILC_WFI_del_station,
 	.change_station = WILC_WFI_change_station,
-- 
2.5.1

[PATCH 14/30] staging: wilc1000: rename WILC_WFI_add_station

[Chaehyun Lim]

This patch replaces WILC_WFI_add_station with wilc_cfg80211_add_station
to avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index c190d8b..ccfd4c6 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3332,7 +3332,7 @@ static int  wilc_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
 }
 
 /**
- *  @brief      WILC_WFI_add_station
+ *  @brief      wilc_cfg80211_add_station
  *  @details    Add a new station.
  *  @param[in]
  *  @return     int : Return 0 on Success.
@@ -3340,7 +3340,7 @@ static int  wilc_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
  *  @date	01 MAR 2012
  *  @version	1.0
  */
-static int  WILC_WFI_add_station(struct wiphy *wiphy, struct net_device *dev,
+static int  wilc_cfg80211_add_station(struct wiphy *wiphy, struct net_device *dev,
 				 const u8 *mac, struct station_parameters *params)
 {
 	s32 s32Error = WILC_SUCCESS;
@@ -3619,7 +3619,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	.start_ap = wilc_cfg80211_start_ap,
 	.change_beacon = wilc_cfg80211_change_beacon,
 	.stop_ap = wilc_cfg80211_stop_ap,
-	.add_station = WILC_WFI_add_station,
+	.add_station = wilc_cfg80211_add_station,
 	.del_station = WILC_WFI_del_station,
 	.change_station = WILC_WFI_change_station,
 	#endif /* WILC_AP_EXTERNAL_MLME*/
-- 
2.5.1

[PATCH 15/30] staging: wilc1000: rename WILC_WFI_del_station

[Chaehyun Lim]

This patch replaces WILC_WFI_del_station with wilc_cfg80211_del_station
to avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index ccfd4c6..02ab135 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3417,7 +3417,7 @@ static int  wilc_cfg80211_add_station(struct wiphy *wiphy, struct net_device *de
 }
 
 /**
- *  @brief      WILC_WFI_del_station
+ *  @brief      wilc_cfg80211_del_station
  *  @details    Remove a station; @mac may be NULL to remove all stations.
  *  @param[in]
  *  @return     int : Return 0 on Success.
@@ -3425,7 +3425,7 @@ static int  wilc_cfg80211_add_station(struct wiphy *wiphy, struct net_device *de
  *  @date	01 MAR 2012
  *  @version	1.0
  */
-static int WILC_WFI_del_station(struct wiphy *wiphy, struct net_device *dev,
+static int wilc_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev,
 				struct station_del_parameters *params)
 {
 	const u8 *mac = params->mac;
@@ -3620,7 +3620,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	.change_beacon = wilc_cfg80211_change_beacon,
 	.stop_ap = wilc_cfg80211_stop_ap,
 	.add_station = wilc_cfg80211_add_station,
-	.del_station = WILC_WFI_del_station,
+	.del_station = wilc_cfg80211_del_station,
 	.change_station = WILC_WFI_change_station,
 	#endif /* WILC_AP_EXTERNAL_MLME*/
 	#ifndef WILC_FULLY_HOSTING_AP
-- 
2.5.1

[PATCH 16/30] staging: wilc1000: rename WILC_WFI_change_station

[Chaehyun Lim]

This patch replaces WILC_WFI_change_station with
wilc_cfg80211_change_station to avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 02ab135..4a46aea 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3464,7 +3464,7 @@ static int wilc_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev
 }
 
 /**
- *  @brief      WILC_WFI_change_station
+ *  @brief      wilc_cfg80211_change_station
  *  @details    Modify a given station.
  *  @param[in]
  *  @return     int : Return 0 on Success.
@@ -3472,7 +3472,7 @@ static int wilc_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev
  *  @date	01 MAR 2012
  *  @version	1.0
  */
-static int WILC_WFI_change_station(struct wiphy *wiphy, struct net_device *dev,
+static int wilc_cfg80211_change_station(struct wiphy *wiphy, struct net_device *dev,
 				   const u8 *mac, struct station_parameters *params)
 {
 	s32 s32Error = WILC_SUCCESS;
@@ -3621,7 +3621,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	.stop_ap = wilc_cfg80211_stop_ap,
 	.add_station = wilc_cfg80211_add_station,
 	.del_station = wilc_cfg80211_del_station,
-	.change_station = WILC_WFI_change_station,
+	.change_station = wilc_cfg80211_change_station,
 	#endif /* WILC_AP_EXTERNAL_MLME*/
 	#ifndef WILC_FULLY_HOSTING_AP
 	.get_station = WILC_WFI_get_station,
-- 
2.5.1

[PATCH 17/30] staging: wilc1000: rename WILC_WFI_get_station

[Chaehyun Lim]

This patch replaces WILC_WFI_get_station with wilc_cfg80211_get_station
to avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 4a46aea..1db8b8d 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1619,7 +1619,7 @@ static int WILC_WFI_dump_survey(struct wiphy *wiphy, struct net_device *netdev,
 
 
 /**
- *  @brief      WILC_WFI_get_station
+ *  @brief      wilc_cfg80211_get_station
  *  @details    Get station information for the station identified by @mac
  *  @param[in]   NONE
  *  @return     int : Return 0 on Success.
@@ -1628,7 +1628,7 @@ static int WILC_WFI_dump_survey(struct wiphy *wiphy, struct net_device *netdev,
  *  @version	1.0
  */
 
-static int WILC_WFI_get_station(struct wiphy *wiphy, struct net_device *dev,
+static int wilc_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
 				const u8 *mac, struct station_info *sinfo)
 {
 	s32 s32Error = WILC_SUCCESS;
@@ -3624,7 +3624,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	.change_station = wilc_cfg80211_change_station,
 	#endif /* WILC_AP_EXTERNAL_MLME*/
 	#ifndef WILC_FULLY_HOSTING_AP
-	.get_station = WILC_WFI_get_station,
+	.get_station = wilc_cfg80211_get_station,
 	#endif
 	.dump_station = WILC_WFI_dump_station,
 	.change_bss = WILC_WFI_change_bss,
-- 
2.5.1

[PATCH 18/30] staging: wilc1000: rename WILC_WFI_dump_station

[Chaehyun Lim]

This patch replaces WILC_WFI_dump_station with
wilc_cfg80211_dump_station to avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 1db8b8d..d448df5 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2759,7 +2759,7 @@ static int    WILC_WFI_set_cqm_rssi_config(struct wiphy *wiphy,
 
 }
 /**
- *  @brief      WILC_WFI_dump_station
+ *  @brief      wilc_cfg80211_dump_station
  *  @details    Configure connection quality monitor RSSI threshold.
  *  @param[in]   struct wiphy *wiphy:
  *  @param[in]	struct net_device *dev
@@ -2771,7 +2771,7 @@ static int    WILC_WFI_set_cqm_rssi_config(struct wiphy *wiphy,
  *  @date	01 MAR 2012
  *  @version	1.0
  */
-static int WILC_WFI_dump_station(struct wiphy *wiphy, struct net_device *dev,
+static int wilc_cfg80211_dump_station(struct wiphy *wiphy, struct net_device *dev,
 				 int idx, u8 *mac, struct station_info *sinfo)
 {
 	struct WILC_WFI_priv *priv;
@@ -3626,7 +3626,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	#ifndef WILC_FULLY_HOSTING_AP
 	.get_station = wilc_cfg80211_get_station,
 	#endif
-	.dump_station = WILC_WFI_dump_station,
+	.dump_station = wilc_cfg80211_dump_station,
 	.change_bss = WILC_WFI_change_bss,
 	.set_wiphy_params = WILC_WFI_set_wiphy_params,
 
-- 
2.5.1

[PATCH 19/30] staging: wilc1000: rename WILC_WFI_change_bss

[Chaehyun Lim]

This patch replaces WILC_WFI_change_bss with wilc_cfg80211_change_bss to
avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index d448df5..c74f95c 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1710,7 +1710,7 @@ static int wilc_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev
 
 
 /**
- *  @brief      WILC_WFI_change_bss
+ *  @brief      wilc_cfg80211_change_bss
  *  @details    Modify parameters for a given BSS.
  *  @param[in]
  *   -use_cts_prot: Whether to use CTS protection
@@ -1730,7 +1730,7 @@ static int wilc_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev
  *  @date	01 MAR 2012
  *  @version	1.0
  */
-static int  WILC_WFI_change_bss(struct wiphy *wiphy, struct net_device *dev,
+static int  wilc_cfg80211_change_bss(struct wiphy *wiphy, struct net_device *dev,
 				struct bss_parameters *params)
 {
 	PRINT_D(CFG80211_DBG, "Changing Bss parametrs\n");
@@ -3627,7 +3627,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	.get_station = wilc_cfg80211_get_station,
 	#endif
 	.dump_station = wilc_cfg80211_dump_station,
-	.change_bss = WILC_WFI_change_bss,
+	.change_bss = wilc_cfg80211_change_bss,
 	.set_wiphy_params = WILC_WFI_set_wiphy_params,
 
 	.set_pmksa = WILC_WFI_set_pmksa,
-- 
2.5.1

[PATCH 20/30] staging: wilc1000: rename WILC_WFI_set_wiphy_params

[Chaehyun Lim]

This patch replaces WILC_WFI_set_wiphy_params with
wilc_cfg80211_set_wiphy_params to avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index c74f95c..25b4531 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1802,7 +1802,7 @@ static int  WILC_WFI_disassoc(struct wiphy *wiphy, struct net_device *dev,
 }
 
 /**
- *  @brief      WILC_WFI_set_wiphy_params
+ *  @brief      wilc_cfg80211_set_wiphy_params
  *  @details    Notify that wiphy parameters have changed;
  *  @param[in]   Changed bitfield (see &enum wiphy_params_flags) describes which values
  *                      have changed.
@@ -1811,7 +1811,7 @@ static int  WILC_WFI_disassoc(struct wiphy *wiphy, struct net_device *dev,
  *  @date	01 MAR 2012
  *  @version	1.0
  */
-static int WILC_WFI_set_wiphy_params(struct wiphy *wiphy, u32 changed)
+static int wilc_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)
 {
 	s32 s32Error = WILC_SUCCESS;
 	tstrCfgParamVal pstrCfgParamVal;
@@ -3628,7 +3628,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	#endif
 	.dump_station = wilc_cfg80211_dump_station,
 	.change_bss = wilc_cfg80211_change_bss,
-	.set_wiphy_params = WILC_WFI_set_wiphy_params,
+	.set_wiphy_params = wilc_cfg80211_set_wiphy_params,
 
 	.set_pmksa = WILC_WFI_set_pmksa,
 	.del_pmksa = WILC_WFI_del_pmksa,
-- 
2.5.1

[PATCH 21/30] staging: wilc1000: rename WILC_WFI_set_pmksa

[Chaehyun Lim]

This patch replaces WILC_WFI_set_pmksa with wilc_cfg80211_set_pmksa to
avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 25b4531..7b2f200 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1880,7 +1880,7 @@ static int WILC_WFI_set_bitrate_mask(struct wiphy *wiphy,
 }
 
 /**
- *  @brief      WILC_WFI_set_pmksa
+ *  @brief      wilc_cfg80211_set_pmksa
  *  @details    Cache a PMKID for a BSSID. This is mostly useful for fullmac
  *                      devices running firmwares capable of generating the (re) association
  *                      RSN IE. It allows for faster roaming between WPA2 BSSIDs.
@@ -1890,7 +1890,7 @@ static int WILC_WFI_set_bitrate_mask(struct wiphy *wiphy,
  *  @date	01 MAR 2012
  *  @version	1.0
  */
-static int WILC_WFI_set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
+static int wilc_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
 			      struct cfg80211_pmksa *pmksa)
 {
 	u32 i;
@@ -3630,7 +3630,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	.change_bss = wilc_cfg80211_change_bss,
 	.set_wiphy_params = wilc_cfg80211_set_wiphy_params,
 
-	.set_pmksa = WILC_WFI_set_pmksa,
+	.set_pmksa = wilc_cfg80211_set_pmksa,
 	.del_pmksa = WILC_WFI_del_pmksa,
 	.flush_pmksa = WILC_WFI_flush_pmksa,
 #ifdef WILC_P2P
-- 
2.5.1

[PATCH 22/30] staging: wilc1000: rename WILC_WFI_del_pmksa

[Chaehyun Lim]

This patch replaces WILC_WFI_del_pmksa with wilc_cfg80211_del_pmksa to
avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 7b2f200..bdcd649 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1932,7 +1932,7 @@ static int wilc_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *netde
 }
 
 /**
- *  @brief      WILC_WFI_del_pmksa
+ *  @brief      wilc_cfg80211_del_pmksa
  *  @details    Delete a cached PMKID.
  *  @param[in]
  *  @return     int : Return 0 on Success
@@ -1940,7 +1940,7 @@ static int wilc_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *netde
  *  @date	01 MAR 2012
  *  @version	1.0
  */
-static int WILC_WFI_del_pmksa(struct wiphy *wiphy, struct net_device *netdev,
+static int wilc_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *netdev,
 			      struct cfg80211_pmksa *pmksa)
 {
 
@@ -3631,7 +3631,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	.set_wiphy_params = wilc_cfg80211_set_wiphy_params,
 
 	.set_pmksa = wilc_cfg80211_set_pmksa,
-	.del_pmksa = WILC_WFI_del_pmksa,
+	.del_pmksa = wilc_cfg80211_del_pmksa,
 	.flush_pmksa = WILC_WFI_flush_pmksa,
 #ifdef WILC_P2P
 	.remain_on_channel = WILC_WFI_remain_on_channel,
-- 
2.5.1

[PATCH 23/30] staging: wilc1000: rename WILC_WFI_flush_pmksa

[Chaehyun Lim]

This patch replaces WILC_WFI_flush_pmksa with wilc_cfg80211_flush_pmksa
to avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index bdcd649..3c49412 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1981,7 +1981,7 @@ static int wilc_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *netde
 }
 
 /**
- *  @brief      WILC_WFI_flush_pmksa
+ *  @brief      wilc_cfg80211_flush_pmksa
  *  @details    Flush all cached PMKIDs.
  *  @param[in]
  *  @return     int : Return 0 on Success
@@ -1989,7 +1989,7 @@ static int wilc_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *netde
  *  @date	01 MAR 2012
  *  @version	1.0
  */
-static int  WILC_WFI_flush_pmksa(struct wiphy *wiphy, struct net_device *netdev)
+static int  wilc_cfg80211_flush_pmksa(struct wiphy *wiphy, struct net_device *netdev)
 {
 	struct WILC_WFI_priv *priv = wiphy_priv(wiphy);
 
@@ -3632,7 +3632,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 
 	.set_pmksa = wilc_cfg80211_set_pmksa,
 	.del_pmksa = wilc_cfg80211_del_pmksa,
-	.flush_pmksa = WILC_WFI_flush_pmksa,
+	.flush_pmksa = wilc_cfg80211_flush_pmksa,
 #ifdef WILC_P2P
 	.remain_on_channel = WILC_WFI_remain_on_channel,
 	.cancel_remain_on_channel = WILC_WFI_cancel_remain_on_channel,
-- 
2.5.1

[PATCH 24/30] staging: wilc1000: rename WILC_WFI_remain_on_channel

[Chaehyun Lim]

This patch replaces WILC_WFI_remain_on_channel with
wilc_cfg80211_remain_on_channel to avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 3c49412..f071389 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2391,7 +2391,7 @@ static void WILC_WFI_RemainOnChannelExpired(void *pUserVoid, u32 u32SessionID)
 
 
 /**
- *  @brief      WILC_WFI_remain_on_channel
+ *  @brief      wilc_cfg80211_remain_on_channel
  *  @details    Request the driver to remain awake on the specified
  *                      channel for the specified duration to complete an off-channel
  *                      operation (e.g., public action frame exchange). When the driver is
@@ -2403,7 +2403,7 @@ static void WILC_WFI_RemainOnChannelExpired(void *pUserVoid, u32 u32SessionID)
  *  @date	01 MAR 2012
  *  @version	1.0
  */
-static int  WILC_WFI_remain_on_channel(struct wiphy *wiphy,
+static int  wilc_cfg80211_remain_on_channel(struct wiphy *wiphy,
 				       struct wireless_dev *wdev,
 				       struct ieee80211_channel *chan,
 				       unsigned int duration, u64 *cookie)
@@ -3634,7 +3634,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	.del_pmksa = wilc_cfg80211_del_pmksa,
 	.flush_pmksa = wilc_cfg80211_flush_pmksa,
 #ifdef WILC_P2P
-	.remain_on_channel = WILC_WFI_remain_on_channel,
+	.remain_on_channel = wilc_cfg80211_remain_on_channel,
 	.cancel_remain_on_channel = WILC_WFI_cancel_remain_on_channel,
 	.mgmt_tx_cancel_wait = WILC_WFI_mgmt_tx_cancel_wait,
 	.mgmt_tx = WILC_WFI_mgmt_tx,
-- 
2.5.1

[PATCH 25/30] staging: wilc1000: rename WILC_WFI_cancel_remain_on_channel

[Chaehyun Lim]

This patch replaces WILC_WFI_cancel_remain_on_channel with
wilc_cfg80211_cancel_remain_on_channel to avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index f071389..3e6af0c 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2444,7 +2444,7 @@ static int  wilc_cfg80211_remain_on_channel(struct wiphy *wiphy,
 }
 
 /**
- *  @brief      WILC_WFI_cancel_remain_on_channel
+ *  @brief      wilc_cfg80211_cancel_remain_on_channel
  *  @details    Cancel an on-going remain-on-channel operation.
  *                      This allows the operation to be terminated prior to timeout based on
  *                      the duration value.
@@ -2456,7 +2456,7 @@ static int  wilc_cfg80211_remain_on_channel(struct wiphy *wiphy,
  *  @date	01 MAR 2012
  *  @version	1.0
  */
-static int   WILC_WFI_cancel_remain_on_channel(struct wiphy *wiphy,
+static int   wilc_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy,
 					       struct wireless_dev *wdev,
 					       u64 cookie)
 {
@@ -3635,7 +3635,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	.flush_pmksa = wilc_cfg80211_flush_pmksa,
 #ifdef WILC_P2P
 	.remain_on_channel = wilc_cfg80211_remain_on_channel,
-	.cancel_remain_on_channel = WILC_WFI_cancel_remain_on_channel,
+	.cancel_remain_on_channel = wilc_cfg80211_cancel_remain_on_channel,
 	.mgmt_tx_cancel_wait = WILC_WFI_mgmt_tx_cancel_wait,
 	.mgmt_tx = WILC_WFI_mgmt_tx,
 	.mgmt_frame_register = WILC_WFI_frame_register,
-- 
2.5.1

[PATCH 26/30] staging: wilc1000: rename WILC_WFI_mgmt_tx_cancel_wait

[Chaehyun Lim]

This patch replaces WILC_WFI_mgmt_tx_cancel_wait with
wilc_cfg80211_mgmt_tx_cancel_wait to avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 3e6af0c..e65c18a 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2651,7 +2651,7 @@ int WILC_WFI_mgmt_tx(struct wiphy *wiphy,
 	return s32Error;
 }
 
-int   WILC_WFI_mgmt_tx_cancel_wait(struct wiphy *wiphy,
+int   wilc_cfg80211_mgmt_tx_cancel_wait(struct wiphy *wiphy,
 				   struct wireless_dev *wdev,
 				   u64 cookie)
 {
@@ -3636,7 +3636,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 #ifdef WILC_P2P
 	.remain_on_channel = wilc_cfg80211_remain_on_channel,
 	.cancel_remain_on_channel = wilc_cfg80211_cancel_remain_on_channel,
-	.mgmt_tx_cancel_wait = WILC_WFI_mgmt_tx_cancel_wait,
+	.mgmt_tx_cancel_wait = wilc_cfg80211_mgmt_tx_cancel_wait,
 	.mgmt_tx = WILC_WFI_mgmt_tx,
 	.mgmt_frame_register = WILC_WFI_frame_register,
 	.set_power_mgmt = WILC_WFI_set_power_mgmt,
-- 
2.5.1

[PATCH 27/30] staging: wilc1000: rename WILC_WFI_mgmt_tx

[Chaehyun Lim]

This patch replaces WILC_WFI_mgmt_tx with wilc_cfg80211_mgmt_tx to avoid
CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index e65c18a..5f56f8b 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2496,7 +2496,7 @@ void WILC_WFI_add_wilcvendorspec(u8 *buff)
  */
 extern linux_wlan_t *g_linux_wlan;
 extern bool bEnablePS;
-int WILC_WFI_mgmt_tx(struct wiphy *wiphy,
+int wilc_cfg80211_mgmt_tx(struct wiphy *wiphy,
 			struct wireless_dev *wdev,
 			struct cfg80211_mgmt_tx_params *params,
 			u64 *cookie)
@@ -3637,7 +3637,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	.remain_on_channel = wilc_cfg80211_remain_on_channel,
 	.cancel_remain_on_channel = wilc_cfg80211_cancel_remain_on_channel,
 	.mgmt_tx_cancel_wait = wilc_cfg80211_mgmt_tx_cancel_wait,
-	.mgmt_tx = WILC_WFI_mgmt_tx,
+	.mgmt_tx = wilc_cfg80211_mgmt_tx,
 	.mgmt_frame_register = WILC_WFI_frame_register,
 	.set_power_mgmt = WILC_WFI_set_power_mgmt,
 	.set_cqm_rssi_config = WILC_WFI_set_cqm_rssi_config,
-- 
2.5.1

[PATCH 28/30] staging: wilc1000: rename WILC_WFI_frame_register

[Chaehyun Lim]

This patch replaces WILC_WFI_frame_register with
wilc_cfg80211_mgmt_frame_register to avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/linux_wlan.c             | 6 +++---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index b9459a5..9c9ad65 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1752,7 +1752,7 @@ int mac_init_fn(struct net_device *ndev)
 }
 #endif
 
-void    WILC_WFI_frame_register(struct wiphy *wiphy, struct net_device *dev,
+void    wilc_cfg80211_mgmt_frame_register(struct wiphy *wiphy, struct net_device *dev,
 				u16 frame_type, bool reg);
 
 /* This fn is called, when this device is setup using ifconfig */
@@ -1814,9 +1814,9 @@ int mac_open(struct net_device *ndev)
 		goto _err_;
 	}
 
-	WILC_WFI_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy, nic->wilc_netdev,
+	wilc_cfg80211_mgmt_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy, nic->wilc_netdev,
 				nic->g_struct_frame_reg[0].frame_type, nic->g_struct_frame_reg[0].reg);
-	WILC_WFI_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy, nic->wilc_netdev,
+	wilc_cfg80211_mgmt_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy, nic->wilc_netdev,
 				nic->g_struct_frame_reg[1].frame_type, nic->g_struct_frame_reg[1].reg);
 	netif_wake_queue(ndev);
 	g_linux_wlan->open_ifcs++;
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 5f56f8b..55ca2db 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2678,7 +2678,7 @@ int   wilc_cfg80211_mgmt_tx_cancel_wait(struct wiphy *wiphy,
 }
 
 /**
- *  @brief      WILC_WFI_frame_register
+ *  @brief      wilc_cfg80211_mgmt_frame_register
  *  @details Notify driver that a management frame type was
  *              registered. Note that this callback may not sleep, and cannot run
  *                      concurrently with itself.
@@ -2688,7 +2688,7 @@ int   wilc_cfg80211_mgmt_tx_cancel_wait(struct wiphy *wiphy,
  *  @date	01 JUL 2012
  *  @version
  */
-void    WILC_WFI_frame_register(struct wiphy *wiphy,
+void    wilc_cfg80211_mgmt_frame_register(struct wiphy *wiphy,
 				struct wireless_dev *wdev,
 				u16 frame_type, bool reg)
 {
@@ -3638,7 +3638,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	.cancel_remain_on_channel = wilc_cfg80211_cancel_remain_on_channel,
 	.mgmt_tx_cancel_wait = wilc_cfg80211_mgmt_tx_cancel_wait,
 	.mgmt_tx = wilc_cfg80211_mgmt_tx,
-	.mgmt_frame_register = WILC_WFI_frame_register,
+	.mgmt_frame_register = wilc_cfg80211_mgmt_frame_register,
 	.set_power_mgmt = WILC_WFI_set_power_mgmt,
 	.set_cqm_rssi_config = WILC_WFI_set_cqm_rssi_config,
 #endif
-- 
2.5.1

[PATCH 29/30] staging: wilc1000: rename WILC_WFI_set_power_mgmt

[Chaehyun Lim]

This patch replaces WILC_WFI_set_power_mgmt with
wilc_cfg80211_set_power_mgmt to avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 55ca2db..078220f 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2793,7 +2793,7 @@ static int wilc_cfg80211_dump_station(struct wiphy *wiphy, struct net_device *de
 
 
 /**
- *  @brief      WILC_WFI_set_power_mgmt
+ *  @brief      wilc_cfg80211_set_power_mgmt
  *  @details
  *  @param[in]
  *  @return     int : Return 0 on Success.
@@ -2801,7 +2801,7 @@ static int wilc_cfg80211_dump_station(struct wiphy *wiphy, struct net_device *de
  *  @date	01 JUL 2012
  *  @version	1.0WILC_WFI_set_cqmWILC_WFI_set_cqm_rssi_configWILC_WFI_set_cqm_rssi_configWILC_WFI_set_cqm_rssi_configWILC_WFI_set_cqm_rssi_config_rssi_config
  */
-int WILC_WFI_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
+int wilc_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
 			    bool enabled, int timeout)
 {
 	struct WILC_WFI_priv *priv;
@@ -3639,7 +3639,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	.mgmt_tx_cancel_wait = wilc_cfg80211_mgmt_tx_cancel_wait,
 	.mgmt_tx = wilc_cfg80211_mgmt_tx,
 	.mgmt_frame_register = wilc_cfg80211_mgmt_frame_register,
-	.set_power_mgmt = WILC_WFI_set_power_mgmt,
+	.set_power_mgmt = wilc_cfg80211_set_power_mgmt,
 	.set_cqm_rssi_config = WILC_WFI_set_cqm_rssi_config,
 #endif
 
-- 
2.5.1

[PATCH 30/30] staging: wilc1000: rename WILC_WFI_set_cqm_rssi_config

[Chaehyun Lim]

This patch replaces WILC_WFI_set_cqm_rssi_config with
wilc_cfg80211_set_cqm_rssi_config to avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 078220f..ee29be7 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2740,7 +2740,7 @@ void    wilc_cfg80211_mgmt_frame_register(struct wiphy *wiphy,
 #endif /*WILC_P2P*/
 
 /**
- *  @brief      WILC_WFI_set_cqm_rssi_config
+ *  @brief      wilc_cfg80211_set_cqm_rssi_config
  *  @details    Configure connection quality monitor RSSI threshold.
  *  @param[in]   struct wiphy *wiphy:
  *  @param[in]	struct net_device *dev:
@@ -2751,7 +2751,7 @@ void    wilc_cfg80211_mgmt_frame_register(struct wiphy *wiphy,
  *  @date	01 MAR 2012
  *  @version	1.0
  */
-static int    WILC_WFI_set_cqm_rssi_config(struct wiphy *wiphy,
+static int    wilc_cfg80211_set_cqm_rssi_config(struct wiphy *wiphy,
 					   struct net_device *dev,  s32 rssi_thold, u32 rssi_hyst)
 {
 	PRINT_D(CFG80211_DBG, "Setting CQM RSSi Function\n");
@@ -3640,7 +3640,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = {
 	.mgmt_tx = wilc_cfg80211_mgmt_tx,
 	.mgmt_frame_register = wilc_cfg80211_mgmt_frame_register,
 	.set_power_mgmt = wilc_cfg80211_set_power_mgmt,
-	.set_cqm_rssi_config = WILC_WFI_set_cqm_rssi_config,
+	.set_cqm_rssi_config = wilc_cfg80211_set_cqm_rssi_config,
 #endif
 
 };
-- 
2.5.1

Re: [PATCH 01/30] staging: wilc1000: rename WILC_WFI_CfgSetChannel

[Johannes Berg]

> -static int WILC_WFI_CfgSetChannel(struct wiphy *wiphy,
> +static int wilc_cfg80211_set_monitor_channel(struct wiphy *wiphy,
>  				  struct cfg80211_chan_def *chandef)
>  {
> 
You should probably consider not breaking indentation while doing this
:)

And perhaps cfg80211_ in there is a bit too long - I'm not sure it's
needed at all, but if so cfg_ would probably be sufficient?

johannes

Re: [PATCH 01/30] staging: wilc1000: rename WILC_WFI_CfgSetChannel

[Greg KH]

On Wed, Sep 09, 2015 at 12:55:38AM +0900, Chaehyun Lim wrote:
> This patch replaces WILC_WFI_CfgSetChannel with
> wilc_cfg80211_set_monitor_channel to avoid CamelCase.

Like was said, this is now longer, how about something "simple" like
wilc_set_channel()?

Actually, as this is a static function, set_channel() would work, no
need to prefix static functions as it's obvious it is "wilc".

Same for all of the other patches in this series, can you please redo
them to be simpler?

thanks,

greg k-h