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

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

staging: wilc1000: rename pvUserArg in wilc_set_join_req 



This patch renames pvUserArg to user_arg to avoid camelcase.

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

drivers/staging/wilc1000/host_interface.c

+2 −2
Original line number Diff line number Diff line
@@ -3367,7 +3367,7 @@ int wilc_set_mac_address(struct wilc_vif *vif, u8 *mac_addr) 


int wilc_set_join_req(struct wilc_vif *vif, u8 *bssid, const u8 *ssid,

		      size_t ssid_len, const u8 *ies, size_t ies_len,

		      wilc_connect_result connect_result, void *pvUserArg,

		      wilc_connect_result connect_result, void *user_arg,

		      u8 u8security, enum AUTHTYPE tenuAuth_type,

		      u8 u8channel, void *pJoinParams)

{
@@ -3393,7 +3393,7 @@ int wilc_set_join_req(struct wilc_vif *vif, u8 *bssid, const u8 *ssid, 
	msg.body.con_info.auth_type = tenuAuth_type;

	msg.body.con_info.ch = u8channel;

	msg.body.con_info.result = connect_result;

	msg.body.con_info.arg = pvUserArg;

	msg.body.con_info.arg = user_arg;

	msg.body.con_info.params = pJoinParams;

	msg.vif = vif;

drivers/staging/wilc1000/host_interface.h

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ int wilc_set_mac_address(struct wilc_vif *vif, u8 *mac_addr); 
int wilc_wait_msg_queue_idle(void);

int wilc_set_join_req(struct wilc_vif *vif, u8 *bssid, const u8 *ssid,

		      size_t ssid_len, const u8 *ies, size_t ies_len,

		      wilc_connect_result connect_result, void *pvUserArg,

		      wilc_connect_result connect_result, void *user_arg,

		      u8 u8security, enum AUTHTYPE tenuAuth_type,

		      u8 u8channel, void *pJoinParams);

int wilc_flush_join_req(struct wilc_vif *vif);