OSDN Git Service

staging: wilc1000: rename u8KeyIdx in host_int_add_rx_gtk
authorChaehyun Lim <chaehyun.lim@gmail.com>
Sun, 8 Nov 2015 07:49:09 +0000 (16:49 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Dec 2015 22:14:03 +0000 (14:14 -0800)
This patch changes u8KeyIdx to index 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 5c40d40..22fdca5 100644 (file)
@@ -3274,7 +3274,7 @@ 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 gtk_key_len, u8 u8KeyIdx,
+                       u8 gtk_key_len, u8 index,
                        u32 u32KeyRSClen, const u8 *KeyRSC,
                        const u8 *pu8RxMic, const u8 *pu8TxMic,
                        u8 mode, u8 u8Ciphermode)
@@ -3322,7 +3322,7 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
                memcpy(msg.body.key_info.attr.wpa.key + 24, pu8TxMic,
                       TX_MIC_KEY_LEN);
 
-       msg.body.key_info.attr.wpa.index = u8KeyIdx;
+       msg.body.key_info.attr.wpa.index = index;
        msg.body.key_info.attr.wpa.key_len = u8KeyLen;
        msg.body.key_info.attr.wpa.seq_len = u32KeyRSClen;
 
index 6b7b05e..41ca349 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 gtk_key_len, u8 u8KeyIdx,
+                       u8 gtk_key_len, u8 index,
                        u32 u32KeyRSClen, const u8 *KeyRSC,
                        const u8 *pu8RxMic, const u8 *pu8TxMic,
                        u8 mode, u8 u8Ciphermode);