staging: wilc1000: rename WILC_WFI_frame_register

This patch replaces WILC_WFI_frame_register with
wilc_mgmt_frame_register to avoid CamelCase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index cf277491ac3faa4ed4e164a27c212c16ec000c17..7857ad2d2fa4440637738aef52fdf1caaf092ef9 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1461,10 +1461,10 @@ int mac_open(struct net_device *ndev)
                goto _err_;
        }
 
-       WILC_WFI_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy, nic->wilc_netdev->ieee80211_ptr,
-                               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->ieee80211_ptr,
-                               nic->g_struct_frame_reg[1].frame_type, nic->g_struct_frame_reg[1].reg);
+       wilc_mgmt_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy, nic->wilc_netdev->ieee80211_ptr,
+                                nic->g_struct_frame_reg[0].frame_type, nic->g_struct_frame_reg[0].reg);
+       wilc_mgmt_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy, nic->wilc_netdev->ieee80211_ptr,
+                                nic->g_struct_frame_reg[1].frame_type, nic->g_struct_frame_reg[1].reg);
        netif_wake_queue(ndev);
        g_linux_wlan->open_ifcs++;
        nic->mac_opened = 1;

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index a51560f85ba93ed49f8a1651fe7c04ac87d8d2c3..de8c83d7d662a3d21981e67e2792358400851915 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2539,7 +2539,7 @@ int mgmt_tx_cancel_wait(struct wiphy *wiphy,
 }
 
 /**
- *  @brief      WILC_WFI_frame_register
+ *  @brief      wilc_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.
@@ -2549,9 +2549,8 @@ int mgmt_tx_cancel_wait(struct wiphy *wiphy,
  *  @date      01 JUL 2012
  *  @version
  */
-void    WILC_WFI_frame_register(struct wiphy *wiphy,
-                               struct wireless_dev *wdev,
-                               u16 frame_type, bool reg)
+void wilc_mgmt_frame_register(struct wiphy *wiphy, struct wireless_dev *wdev,
+                             u16 frame_type, bool reg)
 {
 
        struct wilc_priv *priv;
@@ -3410,7 +3409,7 @@ static struct cfg80211_ops wilc_cfg80211_ops = {
        .cancel_remain_on_channel = cancel_remain_on_channel,
        .mgmt_tx_cancel_wait = mgmt_tx_cancel_wait,
        .mgmt_tx = mgmt_tx,
-       .mgmt_frame_register = WILC_WFI_frame_register,
+       .mgmt_frame_register = wilc_mgmt_frame_register,
        .set_power_mgmt = WILC_WFI_set_power_mgmt,
        .set_cqm_rssi_config = WILC_WFI_set_cqm_rssi_config,
 

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h
index c32355597ab2965aa70fa33817d56ec1335e1b83..b240a794957d803a56ddfdcc4529f49cfde01b21 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h
@@ -100,8 +100,8 @@ int wilc_init_host_int(struct net_device *net);
 void WILC_WFI_monitor_rx(u8 *buff, u32 size);
 int WILC_WFI_deinit_mon_interface(void);
 struct net_device *WILC_WFI_init_mon_interface(const char *name, struct net_device *real_dev);
-void WILC_WFI_frame_register(struct wiphy *wiphy, struct wireless_dev *wdev,
-                            u16 frame_type, bool reg);
+void wilc_mgmt_frame_register(struct wiphy *wiphy, struct wireless_dev *wdev,
+                             u16 frame_type, bool reg);
 
 #define TCP_ACK_FILTER_LINK_SPEED_THRESH       54
 #define DEFAULT_LINK_SPEED                     72