Commit d7c0242b authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman

staging: wilc1000: rename pu8TxMic in host_int_add_ptk

This patch changes pu8TxMic to tx_mic to avoid camelcase.
Signed-off-by: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 38f66290
...@@ -3209,7 +3209,7 @@ int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv, ...@@ -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, int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
u8 ptk_key_len, const u8 *mac_addr, 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) u8 mode, u8 u8Ciphermode, u8 u8Idx)
{ {
int result = 0; int result = 0;
...@@ -3225,7 +3225,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk, ...@@ -3225,7 +3225,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
if (rx_mic) if (rx_mic)
u8KeyLen += RX_MIC_KEY_LEN; u8KeyLen += RX_MIC_KEY_LEN;
if (pu8TxMic) if (tx_mic)
u8KeyLen += TX_MIC_KEY_LEN; u8KeyLen += TX_MIC_KEY_LEN;
memset(&msg, 0, sizeof(struct host_if_msg)); 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, ...@@ -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]); PRINT_INFO(CFG80211_DBG, "PairwiseRx[%d] = %x\n", i, rx_mic[i]);
} }
} }
if (pu8TxMic) { if (tx_mic) {
memcpy(msg.body.key_info.attr.wpa.key + 24, pu8TxMic, TX_MIC_KEY_LEN); memcpy(msg.body.key_info.attr.wpa.key + 24, tx_mic, TX_MIC_KEY_LEN);
if (INFO) { if (INFO) {
for (i = 0; i < TX_MIC_KEY_LEN; i++) 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]);
} }
} }
......
...@@ -313,7 +313,7 @@ int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv, ...@@ -313,7 +313,7 @@ int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv,
enum AUTHTYPE auth_type); enum AUTHTYPE auth_type);
int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk, int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
u8 ptk_key_len, const u8 *mac_addr, 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); u8 mode, u8 u8Ciphermode, u8 u8Idx);
s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac, s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,
u32 *pu32InactiveTime); u32 *pu32InactiveTime);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment