From: Chaehyun Lim Date: Sun, 8 Nov 2015 07:49:00 +0000 (+0900) Subject: staging: wilc1000: rename u8Ciphermode in host_int_add_ptk X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f0c82579d853825d5728d189dba8dbbad61cbaca;p=linux-beck.git staging: wilc1000: rename u8Ciphermode in host_int_add_ptk This patch changes u8Ciphermode to cipher_mode to avoid camelcase. Signed-off-by: Chaehyun Lim Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index a8566eebda8a..80a1442ab6d2 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -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)); diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index 5da584b9d8cc..04ecf502a3a3 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -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,