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

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

staging: wilc1000: rename pJoinParams in wilc_set_join_req 



This patch renames pJoinParams to join_params to avoid camelcase.

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

drivers/staging/wilc1000/host_interface.c

+3 −3
Original line number Diff line number Diff line
@@ -3369,7 +3369,7 @@ 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 *user_arg,

		      u8 security, enum AUTHTYPE auth_type,

		      u8 channel, void *pJoinParams)

		      u8 channel, void *join_params)

{

	int result = 0;

	struct host_if_msg msg;
@@ -3380,7 +3380,7 @@ int wilc_set_join_req(struct wilc_vif *vif, u8 *bssid, const u8 *ssid, 
		return -EFAULT;

	}



	if (!pJoinParams) {

	if (!join_params) {

		PRINT_ER("Unable to Join - JoinParams is NULL\n");

		return -EFAULT;

	}
@@ -3394,7 +3394,7 @@ int wilc_set_join_req(struct wilc_vif *vif, u8 *bssid, const u8 *ssid, 
	msg.body.con_info.ch = channel;

	msg.body.con_info.result = connect_result;

	msg.body.con_info.arg = user_arg;

	msg.body.con_info.params = pJoinParams;

	msg.body.con_info.params = join_params;

	msg.vif = vif;



	if (bssid) {

drivers/staging/wilc1000/host_interface.h

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ 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 *user_arg,

		      u8 security, enum AUTHTYPE auth_type,

		      u8 channel, void *pJoinParams);

		      u8 channel, void *join_params);

int wilc_flush_join_req(struct wilc_vif *vif);

s32 wilc_disconnect(struct wilc_vif *vif, u16 u16ReasonCode);

int wilc_set_mac_chnl_num(struct wilc_vif *vif, u8 channel);