Commit f0c82579 authored Nov 08, 2015 by Chaehyun Lim Committed by Greg Kroah-Hartman Dec 18, 2015

staging: wilc1000: rename u8Ciphermode in host_int_add_ptk



This patch changes u8Ciphermode to cipher_mode to avoid camelcase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent d7c0242b

drivers/staging/wilc1000/host_interface.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -3210,7 +3210,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 tx_mic,
		u8 mode, u8 u8Ciphermode, u8 u8Idx)
		u8 mode, u8 cipher_mode, u8 u8Idx)
		{
		int result = 0;
		struct host_if_msg msg;
		@@ -3259,7 +3259,7 @@ int host_int_add_ptk(struct host_if_drv hif_drv, const u8 ptk,

		msg.body.key_info.attr.wpa.key_len = u8KeyLen;
		msg.body.key_info.attr.wpa.mac_addr = mac_addr;
		msg.body.key_info.attr.wpa.mode = u8Ciphermode;
		msg.body.key_info.attr.wpa.mode = cipher_mode;
		msg.drv = hif_drv;

		result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));

drivers/staging/wilc1000/host_interface.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -314,7 +314,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 tx_mic,
		u8 mode, u8 u8Ciphermode, u8 u8Idx);
		u8 mode, u8 cipher_mode, u8 u8Idx);
		s32 host_int_get_inactive_time(struct host_if_drv hWFIDrv, const u8 mac,
		u32 *pu32InactiveTime);
		s32 host_int_add_rx_gtk(struct host_if_drv hWFIDrv, const u8 pu8RxGtk,