diff options
| author | Glen Lee <glen.lee@atmel.com> | 2015-10-27 18:27:57 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-29 08:11:23 +0900 |
| commit | 4ad81fd6125f0a0b612b1a995b584f09e4f80c3b (patch) | |
| tree | 87ba0780e231a99968b9588631581c9f7adba9ff /drivers/staging/wilc1000 | |
| parent | cb1991aca9738d369c14837c73c2b7c183637f92 (diff) | |
staging: wilc1000: GetIfHandler: add argument struct wilc and use it
This patch adds new argument struct wilc and use it instead of
g_linux_wlan. And also pass wilc to the function.
Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000')
| -rw-r--r-- | drivers/staging/wilc1000/linux_wlan.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 6293410ec67c..1f5c8f3467cf 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -374,7 +374,7 @@ void linux_wlan_mac_indicate(struct wilc *wilc, int flag) } -struct net_device *GetIfHandler(u8 *pMacHeader) +struct net_device *GetIfHandler(struct wilc *wilc, u8 *pMacHeader) { u8 *Bssid, *Bssid1; int i = 0; @@ -382,20 +382,20 @@ struct net_device *GetIfHandler(u8 *pMacHeader) Bssid = pMacHeader + 10; Bssid1 = pMacHeader + 4; - for (i = 0; i < g_linux_wlan->vif_num; i++) - if (!memcmp(Bssid1, g_linux_wlan->vif[i].bssid, ETH_ALEN) || - !memcmp(Bssid, g_linux_wlan->vif[i].bssid, ETH_ALEN)) - return g_linux_wlan->vif[i].ndev; + for (i = 0; i < wilc->vif_num; i++) + if (!memcmp(Bssid1, wilc->vif[i].bssid, ETH_ALEN) || + !memcmp(Bssid, wilc->vif[i].bssid, ETH_ALEN)) + return wilc->vif[i].ndev; PRINT_INFO(INIT_DBG, "Invalide handle\n"); for (i = 0; i < 25; i++) PRINT_D(INIT_DBG, "%02x ", pMacHeader[i]); Bssid = pMacHeader + 18; Bssid1 = pMacHeader + 12; - for (i = 0; i < g_linux_wlan->vif_num; i++) - if (!memcmp(Bssid1, g_linux_wlan->vif[i].bssid, ETH_ALEN) || - !memcmp(Bssid, g_linux_wlan->vif[i].bssid, ETH_ALEN)) - return g_linux_wlan->vif[i].ndev; + for (i = 0; i < wilc->vif_num; i++) + if (!memcmp(Bssid1, wilc->vif[i].bssid, ETH_ALEN) || + !memcmp(Bssid, wilc->vif[i].bssid, ETH_ALEN)) + return wilc->vif[i].ndev; PRINT_INFO(INIT_DBG, "\n"); return NULL; @@ -1567,7 +1567,7 @@ void frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset) struct net_device *wilc_netdev; perInterface_wlan_t *nic; - wilc_netdev = GetIfHandler(buff); + wilc_netdev = GetIfHandler(wilc, buff); if (wilc_netdev == NULL) return; |