]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: wilc1000: rename pu8TxMic in host_int_add_rx_gtk
authorChaehyun Lim <chaehyun.lim@gmail.com>
Sun, 8 Nov 2015 07:49:13 +0000 (16:49 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Dec 2015 22:14:03 +0000 (14:14 -0800)
This patch changes pu8TxMic to tx_mic 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 df364dc69682d1ca055576f9826e2cec00609be0..7ca924a279e2a26a1111b4ed8c0845d2b7a58a2c 100644 (file)
@@ -3276,7 +3276,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 index,
                        u32 key_rsc_len, const u8 *key_rsc,
-                       const u8 *rx_mic, const u8 *pu8TxMic,
+                       const u8 *rx_mic, const u8 *tx_mic,
                        u8 mode, u8 u8Ciphermode)
 {
        int result = 0;
@@ -3292,7 +3292,7 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
        if (rx_mic)
                u8KeyLen += RX_MIC_KEY_LEN;
 
-       if (pu8TxMic)
+       if (tx_mic)
                u8KeyLen += TX_MIC_KEY_LEN;
 
        if (key_rsc) {
@@ -3318,8 +3318,8 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
                memcpy(msg.body.key_info.attr.wpa.key + 16, rx_mic,
                       RX_MIC_KEY_LEN);
 
-       if (pu8TxMic)
-               memcpy(msg.body.key_info.attr.wpa.key + 24, pu8TxMic,
+       if (tx_mic)
+               memcpy(msg.body.key_info.attr.wpa.key + 24, tx_mic,
                       TX_MIC_KEY_LEN);
 
        msg.body.key_info.attr.wpa.index = index;
index 42c8749117c2dec7d305424f2744b27993ec26c8..e25f838a188e35923ce1d9495c161f122d5df9fb 100644 (file)
@@ -320,7 +320,7 @@ s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,
 int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
                        u8 gtk_key_len, u8 index,
                        u32 key_rsc_len, const u8 *key_rsc,
-                       const u8 *rx_mic, const u8 *pu8TxMic,
+                       const u8 *rx_mic, const u8 *tx_mic,
                        u8 mode, u8 u8Ciphermode);
 s32 host_int_add_tx_gtk(struct host_if_drv *hWFIDrv, u8 u8KeyLen,
                        u8 *pu8TxGtk, u8 u8KeyIdx);