]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
staging: wilc1000: start_ap: use netdev private data wilc
authorGlen Lee <glen.lee@atmel.com>
Tue, 20 Oct 2015 08:14:02 +0000 (17:14 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 25 Oct 2015 01:16:57 +0000 (18:16 -0700)
Use netdev private data member wilc instead of global variable g_linux_wlan.

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>
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

index 59db1d5ca88e4a46a6845ac6296956ae3fe018f7..5559aa671b8a641a41cf320f13b2a2a0562bd6a3 100644 (file)
@@ -2891,8 +2891,12 @@ static int start_ap(struct wiphy *wiphy, struct net_device *dev,
        struct cfg80211_beacon_data *beacon = &(settings->beacon);
        struct wilc_priv *priv;
        s32 s32Error = 0;
+       struct wilc *wl;
+       perInterface_wlan_t *nic;
 
        priv = wiphy_priv(wiphy);
+       nic = netdev_priv(dev);
+       wl = nic->wilc;
        PRINT_D(HOSTAPD_DBG, "Starting ap\n");
 
        PRINT_D(HOSTAPD_DBG, "Interval = %d\n DTIM period = %d\n Head length = %zu Tail length = %zu\n",
@@ -2903,7 +2907,7 @@ static int start_ap(struct wiphy *wiphy, struct net_device *dev,
        if (s32Error != 0)
                PRINT_ER("Error in setting channel\n");
 
-       linux_wlan_set_bssid(dev, g_linux_wlan->vif[0].src_addr);
+       linux_wlan_set_bssid(dev, wl->vif[0].src_addr);
 
        s32Error = host_int_add_beacon(priv->hWILCWFIDrv,
                                        settings->beacon_interval,