OSDN Git Service

staging: wilc1000: rename pfConnectResult in wilc_set_join_req
authorChaehyun Lim <chaehyun.lim@gmail.com>
Thu, 24 Dec 2015 07:52:26 +0000 (16:52 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Feb 2016 23:08:06 +0000 (15:08 -0800)
This patch renames pfConnectResult to connect_result to avoid camelcase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/host_interface.c
drivers/staging/wilc1000/host_interface.h

index 4421bab..d691c95 100644 (file)
@@ -3367,7 +3367,7 @@ int wilc_set_mac_address(struct wilc_vif *vif, u8 *mac_addr)
 
 int wilc_set_join_req(struct wilc_vif *vif, u8 *bssid, const u8 *ssid,
                      size_t ssid_len, const u8 *ies, size_t ies_len,
-                     wilc_connect_result pfConnectResult, void *pvUserArg,
+                     wilc_connect_result connect_result, void *pvUserArg,
                      u8 u8security, enum AUTHTYPE tenuAuth_type,
                      u8 u8channel, void *pJoinParams)
 {
@@ -3375,7 +3375,7 @@ int wilc_set_join_req(struct wilc_vif *vif, u8 *bssid, const u8 *ssid,
        struct host_if_msg msg;
        struct host_if_drv *hif_drv = vif->hif_drv;
 
-       if (!hif_drv || !pfConnectResult) {
+       if (!hif_drv || !connect_result) {
                PRINT_ER("Driver is null\n");
                return -EFAULT;
        }
@@ -3392,7 +3392,7 @@ int wilc_set_join_req(struct wilc_vif *vif, u8 *bssid, const u8 *ssid,
        msg.body.con_info.security = u8security;
        msg.body.con_info.auth_type = tenuAuth_type;
        msg.body.con_info.ch = u8channel;
-       msg.body.con_info.result = pfConnectResult;
+       msg.body.con_info.result = connect_result;
        msg.body.con_info.arg = pvUserArg;
        msg.body.con_info.params = pJoinParams;
        msg.vif = vif;
index 5edb178..b426132 100644 (file)
@@ -328,7 +328,7 @@ int wilc_set_mac_address(struct wilc_vif *vif, u8 *mac_addr);
 int wilc_wait_msg_queue_idle(void);
 int wilc_set_join_req(struct wilc_vif *vif, u8 *bssid, const u8 *ssid,
                      size_t ssid_len, const u8 *ies, size_t ies_len,
-                     wilc_connect_result pfConnectResult, void *pvUserArg,
+                     wilc_connect_result connect_result, void *pvUserArg,
                      u8 u8security, enum AUTHTYPE tenuAuth_type,
                      u8 u8channel, void *pJoinParams);
 int wilc_flush_join_req(struct wilc_vif *vif);