Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f79758d authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: rename pu8TxMic in host_int_add_rx_gtk 



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 6d36c273

drivers/staging/wilc1000/host_interface.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -3276,7 +3276,7 @@ int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk, 
int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,

int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,

			u8 gtk_key_len,	u8 index,

			u8 gtk_key_len,	u8 index,

			u32 key_rsc_len, const u8 *key_rsc,

			u32 key_rsc_len, const u8 *key_rsc,

			const u8 *rx_mic, const u8 *pu8TxMic,

			const u8 *rx_mic, const u8 *tx_mic,

			u8 mode, u8 u8Ciphermode)

			u8 mode, u8 u8Ciphermode)

{

{

	int result = 0;

	int result = 0;
@@ -3292,7 +3292,7 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk, 
	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;





	if (key_rsc) {

	if (key_rsc) {
@@ -3318,8 +3318,8 @@ int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk, 
		memcpy(msg.body.key_info.attr.wpa.key + 16, rx_mic,

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

		       RX_MIC_KEY_LEN);

		       RX_MIC_KEY_LEN);





	if (pu8TxMic)

	if (tx_mic)

		memcpy(msg.body.key_info.attr.wpa.key + 24, pu8TxMic,

		memcpy(msg.body.key_info.attr.wpa.key + 24, tx_mic,

		       TX_MIC_KEY_LEN);

		       TX_MIC_KEY_LEN);





	msg.body.key_info.attr.wpa.index = index;

	msg.body.key_info.attr.wpa.index = index;

drivers/staging/wilc1000/host_interface.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -320,7 +320,7 @@ s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac, 
int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,

int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,

			u8 gtk_key_len,	u8 index,

			u8 gtk_key_len,	u8 index,

			u32 key_rsc_len, const u8 *key_rsc,

			u32 key_rsc_len, const u8 *key_rsc,

			const u8 *rx_mic, const u8 *pu8TxMic,

			const u8 *rx_mic, const u8 *tx_mic,

			u8 mode, u8 u8Ciphermode);

			u8 mode, u8 u8Ciphermode);

s32 host_int_add_tx_gtk(struct host_if_drv *hWFIDrv, u8 u8KeyLen,

s32 host_int_add_tx_gtk(struct host_if_drv *hWFIDrv, u8 u8KeyLen,

			u8 *pu8TxGtk, u8 u8KeyIdx);

			u8 *pu8TxGtk, u8 u8KeyIdx);