]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: wilc1000: rename u8GtkKeylen in host_int_add_rx_gtk
authorChaehyun Lim <chaehyun.lim@gmail.com>
Sun, 8 Nov 2015 07:49:08 +0000 (16:49 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Dec 2015 22:14:03 +0000 (14:14 -0800)
This patch changes u8GtkKeylen to gtk_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 b79383ef9e95185461f7ee0dfe10fc008500d2d1..5c40d40ff7fbdc19c1f55d6ad7d38e1ba9a8f95a 100644 (file)
@@ -3274,14 +3274,14 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
 }
 
 int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
-                       u8 u8GtkKeylen, u8 u8KeyIdx,
+                       u8 gtk_key_len, u8 u8KeyIdx,
                        u32 u32KeyRSClen, const u8 *KeyRSC,
                        const u8 *pu8RxMic, const u8 *pu8TxMic,
                        u8 mode, u8 u8Ciphermode)
 {
        int result = 0;
        struct host_if_msg msg;
-       u8 u8KeyLen = u8GtkKeylen;
+       u8 u8KeyLen = gtk_key_len;
 
        if (!hif_drv) {
                PRINT_ER("driver is null\n");
@@ -3312,7 +3312,7 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
                msg.body.key_info.action = ADDKEY;
 
        msg.body.key_info.attr.wpa.key = kmalloc(u8KeyLen, GFP_KERNEL);
-       memcpy(msg.body.key_info.attr.wpa.key, rx_gtk, u8GtkKeylen);
+       memcpy(msg.body.key_info.attr.wpa.key, rx_gtk, gtk_key_len);
 
        if (pu8RxMic)
                memcpy(msg.body.key_info.attr.wpa.key + 16, pu8RxMic,
index 51f51be9a55436d09436b5282479e416a3820ad8..6b7b05e41bc4ad92464dd8873e7871409f207833 100644 (file)
@@ -318,7 +318,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
 s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,
                               u32 *pu32InactiveTime);
 int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
-                       u8 u8GtkKeylen, u8 u8KeyIdx,
+                       u8 gtk_key_len, u8 u8KeyIdx,
                        u32 u32KeyRSClen, const u8 *KeyRSC,
                        const u8 *pu8RxMic, const u8 *pu8TxMic,
                        u8 mode, u8 u8Ciphermode);