staging: wilc1000: add wilc to netdev private data structure

This patch add wilc to struct perInterface_wlan_t which is netdev private
data to access wilc via netdev_priv function. Assign wilc to nic->wilc.
The global variable g_linux_wlan will be replaced with netdev private data
member wilc step by step.

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>

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 5701e58f7c4e0b241ef4ea0938e36cee095bd47e..8fa6b7c54f5a08733145a4d32959315526a2dc9a 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1662,6 +1662,7 @@ int wilc_netdev_init(struct wilc **wilc)
 
                nic->u8IfIdx = g_linux_wlan->vif_num;
                nic->wilc_netdev = ndev;
+               nic->wilc = *wilc;
                g_linux_wlan->vif[g_linux_wlan->vif_num].ndev = ndev;
                g_linux_wlan->vif_num++;
                ndev->netdev_ops = &wilc_netdev_ops;

diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index e0c66bcdf88a8ef8d15da6795f28f22deee03bd0..40a44f8318ebd0c259e5130fcaabc66a35ce6405 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -199,7 +199,7 @@ typedef struct {
        struct_frame_reg g_struct_frame_reg[num_reg_frame];
        struct net_device *wilc_netdev;
        struct net_device_stats netstats;
-
+       struct wilc *wilc;
 } perInterface_wlan_t;
 
 struct WILC_WFI_mon_priv {