forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

staging: wilc1000: remove function pointer rx_indicate

Browse source 
This patch removes function pointer rx_indicate and just call the function
wilc_wlan_cfg_indicate_rx instead. Remove static from the function
declration.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Glen Lee 2015-10-02 14:22:10 +09:00 • committed by Greg Kroah-Hartman
commit 30f535a673
4 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1198,7 +1198,7 @@ static void wilc_wlan_handle_rxq(void)
mac_cfg.rx_indicate(&buffer[pkt_offset + offset], pkt_len, &rsp);
wilc_wlan_cfg_indicate_rx(&buffer[pkt_offset + offset], pkt_len, &rsp);
if (rsp.type == WILC_CFG_RSP) {
/**
* wake up the waiting task...

1
drivers/staging/wilc1000/wilc_wlan.h
View file

@ -296,7 +296,6 @@ typedef struct {
} wilc_cfg_rsp_t;
typedef struct {
int (*rx_indicate)(u8 *, int, wilc_cfg_rsp_t *);
int (*cfg_init)(wilc_debug_func);
} wilc_cfg_func_t;

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

@ -505,7 +505,7 @@ int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, u32 buffer_size)
return ret;
}
static int wilc_wlan_cfg_indicate_rx(u8 *frame, int size, wilc_cfg_rsp_t *rsp)
int wilc_wlan_cfg_indicate_rx(u8 *frame, int size, wilc_cfg_rsp_t *rsp)
{
int ret = 1;
u8 msg_type;
@ -566,6 +566,5 @@ static int wilc_wlan_cfg_init(wilc_debug_func func)
}
wilc_cfg_func_t mac_cfg = {
wilc_wlan_cfg_indicate_rx,
wilc_wlan_cfg_init,
};

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

@ -33,5 +33,6 @@ typedef struct {
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, wilc_cfg_rsp_t *rsp);
#endif