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

Commit cd04d221 authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: pass struct wilc 



Pass struct wilc to the following functions. The functions need wilc to
get proper vif using id from wilc device.

Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 71130e81

drivers/staging/wilc1000/coreconfigurator.h

+6 −5
Original line number Diff line number Diff line
@@ -135,9 +135,10 @@ s32 wilc_dealloc_network_info(tstrNetworkInfo *pstrNetworkInfo); 
s32 wilc_parse_assoc_resp_info(u8 *pu8Buffer, u32 u32BufferLen,

		       tstrConnectRespInfo **ppstrConnectRespInfo);

s32 wilc_dealloc_assoc_resp_info(tstrConnectRespInfo *pstrConnectRespInfo);



void wilc_network_info_received(u8 *pu8Buffer, u32 u32Length);

void wilc_gnrl_async_info_received(u8 *pu8Buffer, u32 u32Length);

void wilc_scan_complete_received(u8 *pu8Buffer, u32 u32Length);



void wilc_scan_complete_received(struct wilc *wilc, u8 *pu8Buffer,

				 u32 u32Length);

void wilc_network_info_received(struct wilc *wilc, u8 *pu8Buffer,

				u32 u32Length);

void wilc_gnrl_async_info_received(struct wilc *wilc, u8 *pu8Buffer,

				   u32 u32Length);

#endif

drivers/staging/wilc1000/host_interface.c

+6 −3
Original line number Diff line number Diff line
@@ -4028,7 +4028,8 @@ s32 wilc_deinit(struct wilc_vif *vif) 
	return result;

}



void wilc_network_info_received(u8 *pu8Buffer, u32 u32Length)

void wilc_network_info_received(struct wilc *wilc, u8 *pu8Buffer,

				u32 u32Length)

{

	s32 result = 0;

	struct host_if_msg msg;
@@ -4057,7 +4058,8 @@ void wilc_network_info_received(u8 *pu8Buffer, u32 u32Length) 
		PRINT_ER("Error in sending network info message queue message parameters: Error(%d)\n", result);

}



void wilc_gnrl_async_info_received(u8 *pu8Buffer, u32 u32Length)

void wilc_gnrl_async_info_received(struct wilc *wilc, u8 *pu8Buffer,

				   u32 u32Length)

{

	s32 result = 0;

	struct host_if_msg msg;
@@ -4098,7 +4100,8 @@ void wilc_gnrl_async_info_received(u8 *pu8Buffer, u32 u32Length) 
	up(&hif_sema_deinit);

}



void wilc_scan_complete_received(u8 *pu8Buffer, u32 u32Length)

void wilc_scan_complete_received(struct wilc *wilc, u8 *pu8Buffer,

				 u32 u32Length)

{

	s32 result = 0;

	struct host_if_msg msg;

drivers/staging/wilc1000/wilc_wlan.c

+1 −1
Original line number Diff line number Diff line
@@ -988,7 +988,7 @@ static void wilc_wlan_handle_rxq(struct wilc *wilc) 
				} else {

					struct wilc_cfg_rsp rsp;



					wilc_wlan_cfg_indicate_rx(&buffer[pkt_offset + offset], pkt_len, &rsp);

					wilc_wlan_cfg_indicate_rx(wilc, &buffer[pkt_offset + offset], pkt_len, &rsp);

					if (rsp.type == WILC_CFG_RSP) {

						PRINT_D(RX_DBG, "wilc->cfg_seq_no = %d - rsp.seq_no = %d\n", wilc->cfg_seq_no, rsp.seq_no);

						if (wilc->cfg_seq_no == rsp.seq_no)

drivers/staging/wilc1000/wilc_wlan_cfg.c

+5 −4
Original line number Diff line number Diff line
@@ -495,7 +495,8 @@ int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, u32 buffer_size) 
	return ret;

}



int wilc_wlan_cfg_indicate_rx(u8 *frame, int size, struct wilc_cfg_rsp *rsp)

int wilc_wlan_cfg_indicate_rx(struct wilc *wilc, u8 *frame, int size,

			      struct wilc_cfg_rsp *rsp)

{

	int ret = 1;

	u8 msg_type;
@@ -522,17 +523,17 @@ int wilc_wlan_cfg_indicate_rx(u8 *frame, int size, struct wilc_cfg_rsp *rsp) 
		rsp->seq_no = msg_id;

		/*call host interface info parse as well*/

		PRINT_INFO(RX_DBG, "Info message received\n");

		wilc_gnrl_async_info_received(frame - 4, size + 4);

		wilc_gnrl_async_info_received(wilc, frame - 4, size + 4);

		break;



	case 'N':

		wilc_network_info_received(frame - 4, size + 4);

		wilc_network_info_received(wilc, frame - 4, size + 4);

		rsp->type = 0;

		break;



	case 'S':

		PRINT_INFO(RX_DBG, "Scan Notification Received\n");

		wilc_scan_complete_received(frame - 4, size + 4);

		wilc_scan_complete_received(wilc, frame - 4, size + 4);

		break;



	default:

drivers/staging/wilc1000/wilc_wlan_cfg.h

+3 −1
Original line number Diff line number Diff line
@@ -30,10 +30,12 @@ typedef struct { 
	u8 *str;

} wilc_cfg_str_t;



struct wilc;

int wilc_wlan_cfg_set_wid(u8 *frame, u32 offset, u16 id, u8 *buf, int size);

int wilc_wlan_cfg_get_wid(u8 *frame, u32 offset, u16 id);

int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, u32 buffer_size);

int wilc_wlan_cfg_indicate_rx(u8 *frame, int size, struct wilc_cfg_rsp *rsp);

int wilc_wlan_cfg_indicate_rx(struct wilc *wilc, u8 *frame, int size,

			      struct wilc_cfg_rsp *rsp);

int wilc_wlan_cfg_init(wilc_debug_func func);



#endif