From: Glen Lee <glen....@atmel.com>
This patch changes function parameter type wilc with net_device and use netdev
private data member wilc instead of global variable wl.
Signed-off-by: Glen Lee <glen....@atmel.com>
Signed-off-by: Tony Cho <tony....@atmel.com>
---
drivers/staging/wilc1000/linux_wlan.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wilc1000/linux_wlan.c
b/drivers/staging/wilc1000/linux_wlan.c
index f79160c..38b981d 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -921,8 +921,13 @@ void wilc1000_wlan_deinit(struct wilc *nic)
}
}
-int wlan_init_locks(struct wilc *p_nic)
+int wlan_init_locks(struct net_device *dev)
{
+ perInterface_wlan_t *nic;
+ struct wilc *wl;
+
+ nic = netdev_priv(dev);
+ wl = nic->wilc;
PRINT_D(INIT_DBG, "Initializing Locks ...\n");
@@ -1032,7 +1037,7 @@ int wilc1000_wlan_init(struct net_device *dev,
perInterface_wlan_t *p_nic)
wl->mac_status = WILC_MAC_STATUS_INIT;
wl->close = 0;
- wlan_init_locks(wl);
+ wlan_init_locks(dev);
linux_to_wlan(&nwi, wl);
--
1.9.1
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
