Commit 0743b7ea authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: rename u8PtkKeylen in host_int_add_ptk 



This patch changes u8PtkKeylen to ptk_key_len to avoid camelcase.

Signed-off-by: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d170536f

drivers/staging/wilc1000/host_interface.c

+4 −4
Original line number Diff line number Diff line
@@ -3208,13 +3208,13 @@ 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 u8PtkKeylen, const u8 *mac_addr,

		     u8 ptk_key_len, const u8 *mac_addr,

		     const u8 *pu8RxMic, const u8 *pu8TxMic,

		     u8 mode, u8 u8Ciphermode, u8 u8Idx)

{

	int result = 0;

	struct host_if_msg msg;

	u8 u8KeyLen = u8PtkKeylen;

	u8 u8KeyLen = ptk_key_len;

	u32 i;



	if (!hif_drv) {
@@ -3239,8 +3239,8 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk, 
	if (mode == STATION_MODE)

		msg.body.key_info.action = ADDKEY;



	msg.body.key_info.attr.wpa.key = kmalloc(u8PtkKeylen, GFP_KERNEL);

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

	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);

drivers/staging/wilc1000/host_interface.h

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv, 
				const u8 *key, u8 len, u8 index, u8 mode,

				enum AUTHTYPE auth_type);

int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,

		     u8 u8PtkKeylen, const u8 *mac_addr,

		     u8 ptk_key_len, const u8 *mac_addr,

		     const u8 *pu8RxMic, const u8 *pu8TxMic,

		     u8 mode, u8 u8Ciphermode, u8 u8Idx);

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