Skip to content

L
linux
Commit 299382cf authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman
Browse files
Options

staging: wilc1000: chage_virtual_intf: use netdev private wilc 

Use netdev private data member wilc instead of global variable g_linux_wlan.
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ca64ad6e
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 40 deletions
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
View file @ 299382cf
...@@ -2534,9 +2534,11 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, ...@@ -2534,9 +2534,11 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
u8 interface_type; u8 interface_type;
u16 TID = 0; u16 TID = 0;
u8 i; u8 i;
struct wilc *wl;
nic = netdev_priv(dev); nic = netdev_priv(dev);
priv = wiphy_priv(wiphy); priv = wiphy_priv(wiphy);
wl = nic->wilc;
PRINT_D(HOSTAPD_DBG, "In Change virtual interface function\n"); PRINT_D(HOSTAPD_DBG, "In Change virtual interface function\n");
PRINT_D(HOSTAPD_DBG, "Wireless interface name =%s\n", dev->name); PRINT_D(HOSTAPD_DBG, "Wireless interface name =%s\n", dev->name);
...@@ -2571,30 +2573,31 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, ...@@ -2571,30 +2573,31 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
interface_type = nic->iftype; interface_type = nic->iftype;
nic->iftype = STATION_MODE; nic->iftype = STATION_MODE;
if (g_linux_wlan->initialized) { if (wl->initialized) {
host_int_del_All_Rx_BASession(priv->hWILCWFIDrv, g_linux_wlan->vif[0].bssid, TID); host_int_del_All_Rx_BASession(priv->hWILCWFIDrv,
wl->vif[0].bssid, TID);
/* ensure that the message Q is empty */ /* ensure that the message Q is empty */
host_int_wait_msg_queue_idle(); host_int_wait_msg_queue_idle();
/*Eliminate host interface blocking state*/ /*Eliminate host interface blocking state*/
up(&g_linux_wlan->cfg_event); up(&wl->cfg_event);
wilc1000_wlan_deinit(g_linux_wlan); wilc1000_wlan_deinit(wl);
wilc1000_wlan_init(dev, nic); wilc1000_wlan_init(dev, nic);
g_wilc_initialized = 1; g_wilc_initialized = 1;
nic->iftype = interface_type; nic->iftype = interface_type;
/*Setting interface 1 drv handler and mac address in newly downloaded FW*/ /*Setting interface 1 drv handler and mac address in newly downloaded FW*/
host_int_set_wfi_drv_handler(g_linux_wlan->vif[0].hif_drv); host_int_set_wfi_drv_handler(wl->vif[0].hif_drv);
host_int_set_MacAddress(g_linux_wlan->vif[0].hif_drv, host_int_set_MacAddress(wl->vif[0].hif_drv,
g_linux_wlan->vif[0].src_addr); wl->vif[0].src_addr);
host_int_set_operation_mode(priv->hWILCWFIDrv, STATION_MODE); host_int_set_operation_mode(priv->hWILCWFIDrv, STATION_MODE);
/*Add saved WEP keys, if any*/ /*Add saved WEP keys, if any*/
if (g_wep_keys_saved) { if (g_wep_keys_saved) {
host_int_set_WEPDefaultKeyID(g_linux_wlan->vif[0].hif_drv, host_int_set_WEPDefaultKeyID(wl->vif[0].hif_drv,
g_key_wep_params.key_idx); g_key_wep_params.key_idx);
host_int_add_wep_key_bss_sta(g_linux_wlan->vif[0].hif_drv, host_int_add_wep_key_bss_sta(wl->vif[0].hif_drv,
g_key_wep_params.key, g_key_wep_params.key,
g_key_wep_params.key_len, g_key_wep_params.key_len,
g_key_wep_params.key_idx); g_key_wep_params.key_idx);
...@@ -2612,22 +2615,22 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, ...@@ -2612,22 +2615,22 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
PRINT_D(CFG80211_DBG, "gtk %x %x %x\n", g_key_gtk_params.key[0], PRINT_D(CFG80211_DBG, "gtk %x %x %x\n", g_key_gtk_params.key[0],
g_key_gtk_params.key[1], g_key_gtk_params.key[1],
g_key_gtk_params.key[2]); g_key_gtk_params.key[2]);
add_key(g_linux_wlan->vif[0].ndev->ieee80211_ptr->wiphy, add_key(wl->vif[0].ndev->ieee80211_ptr->wiphy,
g_linux_wlan->vif[0].ndev, wl->vif[0].ndev,
g_add_ptk_key_params.key_idx, g_add_ptk_key_params.key_idx,
g_add_ptk_key_params.pairwise, g_add_ptk_key_params.pairwise,
g_add_ptk_key_params.mac_addr, g_add_ptk_key_params.mac_addr,
(struct key_params *)(&g_key_ptk_params)); (struct key_params *)(&g_key_ptk_params));
add_key(g_linux_wlan->vif[0].ndev->ieee80211_ptr->wiphy, add_key(wl->vif[0].ndev->ieee80211_ptr->wiphy,
g_linux_wlan->vif[0].ndev, wl->vif[0].ndev,
g_add_gtk_key_params.key_idx, g_add_gtk_key_params.key_idx,
g_add_gtk_key_params.pairwise, g_add_gtk_key_params.pairwise,
g_add_gtk_key_params.mac_addr, g_add_gtk_key_params.mac_addr,
(struct key_params *)(&g_key_gtk_params)); (struct key_params *)(&g_key_gtk_params));
} }
if (g_linux_wlan->initialized) { if (wl->initialized) {
for (i = 0; i < num_reg_frame; i++) { for (i = 0; i < num_reg_frame; i++) {
PRINT_D(INIT_DBG, "Frame registering Type: %x - Reg: %d\n", nic->g_struct_frame_reg[i].frame_type, PRINT_D(INIT_DBG, "Frame registering Type: %x - Reg: %d\n", nic->g_struct_frame_reg[i].frame_type,
nic->g_struct_frame_reg[i].reg); nic->g_struct_frame_reg[i].reg);
...@@ -2648,7 +2651,8 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, ...@@ -2648,7 +2651,8 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
connecting = 0; connecting = 0;
PRINT_D(HOSTAPD_DBG, "Interface type = NL80211_IFTYPE_P2P_CLIENT\n"); PRINT_D(HOSTAPD_DBG, "Interface type = NL80211_IFTYPE_P2P_CLIENT\n");
host_int_del_All_Rx_BASession(priv->hWILCWFIDrv, g_linux_wlan->vif[0].bssid, TID); host_int_del_All_Rx_BASession(priv->hWILCWFIDrv,
wl->vif[0].bssid, TID);
dev->ieee80211_ptr->iftype = type; dev->ieee80211_ptr->iftype = type;
priv->wdev->iftype = type; priv->wdev->iftype = type;
...@@ -2658,24 +2662,24 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, ...@@ -2658,24 +2662,24 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
nic->iftype = CLIENT_MODE; nic->iftype = CLIENT_MODE;
if (g_linux_wlan->initialized) { if (wl->initialized) {
/* ensure that the message Q is empty */ /* ensure that the message Q is empty */
host_int_wait_msg_queue_idle(); host_int_wait_msg_queue_idle();
wilc1000_wlan_deinit(g_linux_wlan); wilc1000_wlan_deinit(wl);
wilc1000_wlan_init(dev, nic); wilc1000_wlan_init(dev, nic);
g_wilc_initialized = 1; g_wilc_initialized = 1;
host_int_set_wfi_drv_handler(g_linux_wlan->vif[0].hif_drv); host_int_set_wfi_drv_handler(wl->vif[0].hif_drv);
host_int_set_MacAddress(g_linux_wlan->vif[0].hif_drv, host_int_set_MacAddress(wl->vif[0].hif_drv,
g_linux_wlan->vif[0].src_addr); wl->vif[0].src_addr);
host_int_set_operation_mode(priv->hWILCWFIDrv, STATION_MODE); host_int_set_operation_mode(priv->hWILCWFIDrv, STATION_MODE);
/*Add saved WEP keys, if any*/ /*Add saved WEP keys, if any*/
if (g_wep_keys_saved) { if (g_wep_keys_saved) {
host_int_set_WEPDefaultKeyID(g_linux_wlan->vif[0].hif_drv, host_int_set_WEPDefaultKeyID(wl->vif[0].hif_drv,
g_key_wep_params.key_idx); g_key_wep_params.key_idx);
host_int_add_wep_key_bss_sta(g_linux_wlan->vif[0].hif_drv, host_int_add_wep_key_bss_sta(wl->vif[0].hif_drv,
g_key_wep_params.key, g_key_wep_params.key,
g_key_wep_params.key_len, g_key_wep_params.key_len,
g_key_wep_params.key_idx); g_key_wep_params.key_idx);
...@@ -2693,15 +2697,15 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, ...@@ -2693,15 +2697,15 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
PRINT_D(CFG80211_DBG, "gtk %x %x %x\n", g_key_gtk_params.key[0], PRINT_D(CFG80211_DBG, "gtk %x %x %x\n", g_key_gtk_params.key[0],
g_key_gtk_params.key[1], g_key_gtk_params.key[1],
g_key_gtk_params.key[2]); g_key_gtk_params.key[2]);
add_key(g_linux_wlan->vif[0].ndev->ieee80211_ptr->wiphy, add_key(wl->vif[0].ndev->ieee80211_ptr->wiphy,
g_linux_wlan->vif[0].ndev, wl->vif[0].ndev,
g_add_ptk_key_params.key_idx, g_add_ptk_key_params.key_idx,
g_add_ptk_key_params.pairwise, g_add_ptk_key_params.pairwise,
g_add_ptk_key_params.mac_addr, g_add_ptk_key_params.mac_addr,
(struct key_params *)(&g_key_ptk_params)); (struct key_params *)(&g_key_ptk_params));
add_key(g_linux_wlan->vif[0].ndev->ieee80211_ptr->wiphy, add_key(wl->vif[0].ndev->ieee80211_ptr->wiphy,
g_linux_wlan->vif[0].ndev, wl->vif[0].ndev,
g_add_gtk_key_params.key_idx, g_add_gtk_key_params.key_idx,
g_add_gtk_key_params.pairwise, g_add_gtk_key_params.pairwise,
g_add_gtk_key_params.mac_addr, g_add_gtk_key_params.mac_addr,
...@@ -2712,7 +2716,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, ...@@ -2712,7 +2716,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
refresh_scan(priv, 1, true); refresh_scan(priv, 1, true);
Set_machw_change_vir_if(false); Set_machw_change_vir_if(false);
if (g_linux_wlan->initialized) { if (wl->initialized) {
for (i = 0; i < num_reg_frame; i++) { for (i = 0; i < num_reg_frame; i++) {
PRINT_D(INIT_DBG, "Frame registering Type: %x - Reg: %d\n", nic->g_struct_frame_reg[i].frame_type, PRINT_D(INIT_DBG, "Frame registering Type: %x - Reg: %d\n", nic->g_struct_frame_reg[i].frame_type,
nic->g_struct_frame_reg[i].reg); nic->g_struct_frame_reg[i].reg);
...@@ -2735,7 +2739,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, ...@@ -2735,7 +2739,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
PRINT_D(HOSTAPD_DBG, "Downloading AP firmware\n"); PRINT_D(HOSTAPD_DBG, "Downloading AP firmware\n");
linux_wlan_get_firmware(nic); linux_wlan_get_firmware(nic);
/*If wilc is running, then close-open to actually get new firmware running (serves P2P)*/ /*If wilc is running, then close-open to actually get new firmware running (serves P2P)*/
if (g_linux_wlan->initialized) { if (wl->initialized) {
nic->iftype = AP_MODE; nic->iftype = AP_MODE;
mac_close(dev); mac_close(dev);
mac_open(dev); mac_open(dev);
...@@ -2760,7 +2764,8 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, ...@@ -2760,7 +2764,8 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
/*sent before downloading new FW. This is because it blocks on*/ /*sent before downloading new FW. This is because it blocks on*/
/*hWaitResponse semaphore, which allows previous config*/ /*hWaitResponse semaphore, which allows previous config*/
/*packets to actually take action on old FW*/ /*packets to actually take action on old FW*/
host_int_del_All_Rx_BASession(priv->hWILCWFIDrv, g_linux_wlan->vif[0].bssid, TID); host_int_del_All_Rx_BASession(priv->hWILCWFIDrv,
wl->vif[0].bssid, TID);
bEnablePS = false; bEnablePS = false;
PRINT_D(HOSTAPD_DBG, "Interface type = NL80211_IFTYPE_GO\n"); PRINT_D(HOSTAPD_DBG, "Interface type = NL80211_IFTYPE_GO\n");
dev->ieee80211_ptr->iftype = type; dev->ieee80211_ptr->iftype = type;
...@@ -2775,22 +2780,22 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, ...@@ -2775,22 +2780,22 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
/* ensure that the message Q is empty */ /* ensure that the message Q is empty */
host_int_wait_msg_queue_idle(); host_int_wait_msg_queue_idle();
wilc1000_wlan_deinit(g_linux_wlan); wilc1000_wlan_deinit(wl);
wilc1000_wlan_init(dev, nic); wilc1000_wlan_init(dev, nic);
g_wilc_initialized = 1; g_wilc_initialized = 1;
/*Setting interface 1 drv handler and mac address in newly downloaded FW*/ /*Setting interface 1 drv handler and mac address in newly downloaded FW*/
host_int_set_wfi_drv_handler(g_linux_wlan->vif[0].hif_drv); host_int_set_wfi_drv_handler(wl->vif[0].hif_drv);
host_int_set_MacAddress(g_linux_wlan->vif[0].hif_drv, host_int_set_MacAddress(wl->vif[0].hif_drv,
g_linux_wlan->vif[0].src_addr); wl->vif[0].src_addr);
host_int_set_operation_mode(priv->hWILCWFIDrv, AP_MODE); host_int_set_operation_mode(priv->hWILCWFIDrv, AP_MODE);
/*Add saved WEP keys, if any*/ /*Add saved WEP keys, if any*/
if (g_wep_keys_saved) { if (g_wep_keys_saved) {
host_int_set_WEPDefaultKeyID(g_linux_wlan->vif[0].hif_drv, host_int_set_WEPDefaultKeyID(wl->vif[0].hif_drv,
g_key_wep_params.key_idx); g_key_wep_params.key_idx);
host_int_add_wep_key_bss_sta(g_linux_wlan->vif[0].hif_drv, host_int_add_wep_key_bss_sta(wl->vif[0].hif_drv,
g_key_wep_params.key, g_key_wep_params.key,
g_key_wep_params.key_len, g_key_wep_params.key_len,
g_key_wep_params.key_idx); g_key_wep_params.key_idx);
...@@ -2810,22 +2815,22 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, ...@@ -2810,22 +2815,22 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
g_key_gtk_params.key[1], g_key_gtk_params.key[1],
g_key_gtk_params.key[2], g_key_gtk_params.key[2],
g_key_gtk_params.cipher); g_key_gtk_params.cipher);
add_key(g_linux_wlan->vif[0].ndev->ieee80211_ptr->wiphy, add_key(wl->vif[0].ndev->ieee80211_ptr->wiphy,
g_linux_wlan->vif[0].ndev, wl->vif[0].ndev,
g_add_ptk_key_params.key_idx, g_add_ptk_key_params.key_idx,
g_add_ptk_key_params.pairwise, g_add_ptk_key_params.pairwise,
g_add_ptk_key_params.mac_addr, g_add_ptk_key_params.mac_addr,
(struct key_params *)(&g_key_ptk_params)); (struct key_params *)(&g_key_ptk_params));
add_key(g_linux_wlan->vif[0].ndev->ieee80211_ptr->wiphy, add_key(wl->vif[0].ndev->ieee80211_ptr->wiphy,
g_linux_wlan->vif[0].ndev, wl->vif[0].ndev,
g_add_gtk_key_params.key_idx, g_add_gtk_key_params.key_idx,
g_add_gtk_key_params.pairwise, g_add_gtk_key_params.pairwise,
g_add_gtk_key_params.mac_addr, g_add_gtk_key_params.mac_addr,
(struct key_params *)(&g_key_gtk_params)); (struct key_params *)(&g_key_gtk_params));
} }
if (g_linux_wlan->initialized) { if (wl->initialized) {
for (i = 0; i < num_reg_frame; i++) { for (i = 0; i < num_reg_frame; i++) {
PRINT_D(INIT_DBG, "Frame registering Type: %x - Reg: %d\n", nic->g_struct_frame_reg[i].frame_type, PRINT_D(INIT_DBG, "Frame registering Type: %x - Reg: %d\n", nic->g_struct_frame_reg[i].frame_type,
nic->g_struct_frame_reg[i].reg); nic->g_struct_frame_reg[i].reg);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7