]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: wilc1000: rename ssidLen in wilc_set_join_req
authorChaehyun Lim <chaehyun.lim@gmail.com>
Thu, 24 Dec 2015 07:52:23 +0000 (16:52 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Feb 2016 23:08:06 +0000 (15:08 -0800)
This patch renames ssidLen to ssid_len 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 a146d4fa2b3f5715e924cbb469106164ca86133d..4730b60fe37313d810ad01a2c4febaba5a0b2518 100644 (file)
@@ -3366,7 +3366,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 ssidLen, const u8 *pu8IEs, size_t IEsLen,
+                     size_t ssid_len, const u8 *pu8IEs, size_t IEsLen,
                      wilc_connect_result pfConnectResult, void *pvUserArg,
                      u8 u8security, enum AUTHTYPE tenuAuth_type,
                      u8 u8channel, void *pJoinParams)
@@ -3403,9 +3403,9 @@ int wilc_set_join_req(struct wilc_vif *vif, u8 *bssid, const u8 *ssid,
        }
 
        if (ssid) {
-               msg.body.con_info.ssid_len = ssidLen;
-               msg.body.con_info.ssid = kmalloc(ssidLen, GFP_KERNEL);
-               memcpy(msg.body.con_info.ssid, ssid, ssidLen);
+               msg.body.con_info.ssid_len = ssid_len;
+               msg.body.con_info.ssid = kmalloc(ssid_len, GFP_KERNEL);
+               memcpy(msg.body.con_info.ssid, ssid, ssid_len);
        }
 
        if (pu8IEs) {
index 5d6f8079c7cce0c073172a2f26a666eaa845cf06..4c4674ba791b10a3f78572fef9a87a7cdf34170a 100644 (file)
@@ -327,7 +327,7 @@ int wilc_get_mac_address(struct wilc_vif *vif, u8 *mac_addr);
 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 ssidLen, const u8 *pu8IEs, size_t IEsLen,
+                     size_t ssid_len, const u8 *pu8IEs, size_t IEsLen,
                      wilc_connect_result pfConnectResult, void *pvUserArg,
                      u8 u8security, enum AUTHTYPE tenuAuth_type,
                      u8 u8channel, void *pJoinParams);