]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: wilc1000: rename u8PtkKeylen in host_int_add_ptk
authorChaehyun Lim <chaehyun.lim@gmail.com>
Sun, 8 Nov 2015 07:48:57 +0000 (16:48 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Dec 2015 22:14:03 +0000 (14:14 -0800)
This patch changes u8PtkKeylen to ptk_key_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 d225dbf3c1b04f859f27f40c9353908d7bc03a0e..96a0a58900022e376a8adda11da825f55ff9f1a7 100644 (file)
@@ -3208,13 +3208,13 @@ int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv,
 }
 
 int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
-                    u8 u8PtkKeylen, const u8 *mac_addr,
+                    u8 ptk_key_len, const u8 *mac_addr,
                     const u8 *pu8RxMic, const u8 *pu8TxMic,
                     u8 mode, u8 u8Ciphermode, u8 u8Idx)
 {
        int result = 0;
        struct host_if_msg msg;
-       u8 u8KeyLen = u8PtkKeylen;
+       u8 u8KeyLen = ptk_key_len;
        u32 i;
 
        if (!hif_drv) {
@@ -3239,8 +3239,8 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
        if (mode == STATION_MODE)
                msg.body.key_info.action = ADDKEY;
 
-       msg.body.key_info.attr.wpa.key = kmalloc(u8PtkKeylen, GFP_KERNEL);
-       memcpy(msg.body.key_info.attr.wpa.key, ptk, u8PtkKeylen);
+       msg.body.key_info.attr.wpa.key = kmalloc(ptk_key_len, GFP_KERNEL);
+       memcpy(msg.body.key_info.attr.wpa.key, ptk, ptk_key_len);
 
        if (pu8RxMic) {
                memcpy(msg.body.key_info.attr.wpa.key + 16, pu8RxMic, RX_MIC_KEY_LEN);
index ae70dc578e638eb0204f7b7ec5cd6d5f9f4d92a9..ae0e260d3ca6fdbce486253be13a5a6d55bd80ad 100644 (file)
@@ -312,7 +312,7 @@ int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv,
                                const u8 *key, u8 len, u8 index, u8 mode,
                                enum AUTHTYPE auth_type);
 int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
-                    u8 u8PtkKeylen, const u8 *mac_addr,
+                    u8 ptk_key_len, const u8 *mac_addr,
                     const u8 *pu8RxMic, const u8 *pu8TxMic,
                     u8 mode, u8 u8Ciphermode, u8 u8Idx);
 s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,