[PATCH V2 17/27] staging: wilc1000: mac_ioctl: use private data instead of g_linux_wlan

Glen Lee glen.lee at atmel.com
Tue Oct 27 09:27:53 UTC 2015


Use netdev private data member wilc instead of g_linux_wlan.

Signed-off-by: Glen Lee <glen.lee at atmel.com>
---
 drivers/staging/wilc1000/linux_wlan.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index b6244f93..bd9f715 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1496,11 +1496,13 @@ int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd)
 	perInterface_wlan_t *nic;
 	struct wilc_priv *priv;
 	s32 s32Error = 0;
+	struct wilc *wilc;
 
 	/* struct iwreq *wrq = (struct iwreq *) req;	// tony moved to case SIOCSIWPRIV */
 	nic = netdev_priv(ndev);
+	wilc = nic->wilc;
 
-	if (!g_linux_wlan->initialized)
+	if (!wilc->initialized)
 		return 0;
 
 	switch (cmd) {
-- 
1.9.1



More information about the devel mailing list