Commit 38f66290 authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: rename pu8RxMic in host_int_add_ptk 



This patch changes pu8RxMic to rx_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 0743b7ea

drivers/staging/wilc1000/host_interface.c

+5 −5
Original line number Diff line number Diff line
@@ -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 *pu8RxMic, const u8 *pu8TxMic,

		     const u8 *rx_mic, const u8 *pu8TxMic,

		     u8 mode, u8 u8Ciphermode, u8 u8Idx)

{

	int result = 0;
@@ -3222,7 +3222,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk, 
		return -EFAULT;

	}



	if (pu8RxMic)

	if (rx_mic)

		u8KeyLen += RX_MIC_KEY_LEN;



	if (pu8TxMic)
@@ -3242,11 +3242,11 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk, 
	msg.body.key_info.attr.wpa.key = kmalloc(ptk_key_len, GFP_KERNEL);

	memcpy(msg.body.key_info.attr.wpa.key, ptk, ptk_key_len);



	if (pu8RxMic) {

		memcpy(msg.body.key_info.attr.wpa.key + 16, pu8RxMic, RX_MIC_KEY_LEN);

	if (rx_mic) {

		memcpy(msg.body.key_info.attr.wpa.key + 16, rx_mic, RX_MIC_KEY_LEN);

		if (INFO) {

			for (i = 0; i < RX_MIC_KEY_LEN; i++)

				PRINT_INFO(CFG80211_DBG, "PairwiseRx[%d] = %x\n", i, pu8RxMic[i]);

				PRINT_INFO(CFG80211_DBG, "PairwiseRx[%d] = %x\n", i, rx_mic[i]);

		}

	}

	if (pu8TxMic) {

drivers/staging/wilc1000/host_interface.h

+1 −1
Original line number Diff line number Diff line
@@ -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 *pu8RxMic, const u8 *pu8TxMic,

		     const u8 *rx_mic, const u8 *pu8TxMic,

		     u8 mode, u8 u8Ciphermode, u8 u8Idx);

s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,

			       u32 *pu32InactiveTime);