]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
staging: wilc1000: rename pu8TxMic in host_int_add_ptk
authorChaehyun Lim <chaehyun.lim@gmail.com>
Sun, 8 Nov 2015 07:48:59 +0000 (16:48 +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 9616a6136619df353a6261b02b9496de2ef90c75..a8566eebda8ae8d979f7758d9b4e98fada453c46 100644 (file)
@@ -3209,7 +3209,7 @@ 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 ptk_key_len, const u8 *mac_addr,
-                    const u8 *rx_mic, const u8 *pu8TxMic,
+                    const u8 *rx_mic, const u8 *tx_mic,
                     u8 mode, u8 u8Ciphermode, u8 u8Idx)
 {
        int result = 0;
@@ -3225,7 +3225,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
        if (rx_mic)
                u8KeyLen += RX_MIC_KEY_LEN;
 
-       if (pu8TxMic)
+       if (tx_mic)
                u8KeyLen += TX_MIC_KEY_LEN;
 
        memset(&msg, 0, sizeof(struct host_if_msg));
@@ -3249,11 +3249,11 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
                                PRINT_INFO(CFG80211_DBG, "PairwiseRx[%d] = %x\n", i, rx_mic[i]);
                }
        }
-       if (pu8TxMic) {
-               memcpy(msg.body.key_info.attr.wpa.key + 24, pu8TxMic, TX_MIC_KEY_LEN);
+       if (tx_mic) {
+               memcpy(msg.body.key_info.attr.wpa.key + 24, tx_mic, TX_MIC_KEY_LEN);
                if (INFO) {
                        for (i = 0; i < TX_MIC_KEY_LEN; i++)
-                               PRINT_INFO(CFG80211_DBG, "PairwiseTx[%d] = %x\n", i, pu8TxMic[i]);
+                               PRINT_INFO(CFG80211_DBG, "PairwiseTx[%d] = %x\n", i, tx_mic[i]);
                }
        }
 
index 2ee93045aaf5829143fd1823699924f4637df23e..5da584b9d8cc0631386fc76a4e9075d1752ec94b 100644 (file)
@@ -313,7 +313,7 @@ int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv,
                                enum AUTHTYPE auth_type);
 int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
                     u8 ptk_key_len, const u8 *mac_addr,
-                    const u8 *rx_mic, const u8 *pu8TxMic,
+                    const u8 *rx_mic, const u8 *tx_mic,
                     u8 mode, u8 u8Ciphermode, u8 u8Idx);
 s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,
                               u32 *pu32InactiveTime);