diff options
| author | Glen Lee <glen.lee@atmel.com> | 2015-10-27 18:27:56 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-29 08:11:23 +0900 |
| commit | cb1991aca9738d369c14837c73c2b7c183637f92 (patch) | |
| tree | 0fd2504eed9189760c516b370d3b15285ca27d82 /drivers/staging | |
| parent | db38763516626e89f9b8a3f3892ce1664a43c753 (diff) | |
staging: wilc1000: frmw_to_linux: add argument struct wilc
This patch adds new argument struct wilc and use it instead of
g_linux_wlan. Pass argument wilc to the function as well.
Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/wilc1000/linux_wlan.c | 6 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wfi_netdevice.h | 2 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index d193af871129..6293410ec67c 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -1557,7 +1557,7 @@ done: return s32Error; } -void frmw_to_linux(u8 *buff, u32 size, u32 pkt_offset) +void frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset) { unsigned int frame_len = 0; @@ -1586,8 +1586,8 @@ void frmw_to_linux(u8 *buff, u32 size, u32 pkt_offset) return; } - if (g_linux_wlan == NULL || wilc_netdev == NULL) - PRINT_ER("wilc_netdev in g_linux_wlan is NULL"); + if (wilc == NULL || wilc_netdev == NULL) + PRINT_ER("wilc_netdev in wilc is NULL"); skb->dev = wilc_netdev; if (skb->dev == NULL) diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h index 8ba69ee67c07..bca3e25e1e73 100644 --- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h +++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h @@ -208,7 +208,7 @@ struct WILC_WFI_mon_priv { extern struct wilc *g_linux_wlan; extern struct net_device *WILC_WFI_devs[]; -void frmw_to_linux(u8 *buff, u32 size, u32 pkt_offset); +void frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset); void linux_wlan_mac_indicate(struct wilc *wilc, int flag); void linux_wlan_rx_complete(void); void linux_wlan_dbg(u8 *buff); diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index 1461b61b9cdc..35c4c32d41be 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -1184,7 +1184,8 @@ static void wilc_wlan_handle_rxq(struct wilc *wilc) if (!is_cfg_packet) { if (pkt_len > 0) { - frmw_to_linux(&buffer[offset], + frmw_to_linux(wilc, + &buffer[offset], pkt_len, pkt_offset); has_packet = 1; |