From: Glen Lee Date: Tue, 20 Oct 2015 08:14:02 +0000 (+0900) Subject: staging: wilc1000: start_ap: use netdev private data wilc X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=684dc1861c9e4e1c52de5f8410d6ce4ac0e970ab;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git staging: wilc1000: start_ap: use netdev private data wilc Use netdev private data member wilc instead of global variable g_linux_wlan. Signed-off-by: Glen Lee Signed-off-by: Tony Cho Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index 59db1d5ca88e..5559aa671b8a 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -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,