redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: wilc1000: pass struct wilc

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

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Glen Lee 2015-12-21 14:18:42 +09:00 committed by Greg Kroah-Hartman
parent 71130e812a
commit cd04d221dd
5 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/staging/wilc1000/coreconfigurator.h
View file

@ -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

9
drivers/staging/wilc1000/host_interface.c
View file

@ -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;

2
drivers/staging/wilc1000/wilc_wlan.c
View file

@ -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)

9
drivers/staging/wilc1000/wilc_wlan_cfg.c
View file

@ -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:

4
drivers/staging/wilc1000/wilc_wlan_cfg.h
View file

@ -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