OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ath6kl: Move initialization/deinitialization of scan_table to appropriate functions 

By having scan_table in struct ath6kl, it makes sense to move initialization
to ath6kl_init() and deinitialization to ath6kl_destroy().

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Vasanthakumar Thiagarajan 2011-07-21 14:24:54 +05:30 committed by Kalle Valo
parent 9d0c6bcf46
commit 852bd9d995
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/wireless/ath/ath6kl/init.c
View File

@ -1062,6 +1062,8 @@ static int ath6kl_init(struct net_device *dev)
ath6kl_dbg(ATH6KL_DBG_TRC, "%s: got wmi @ 0x%p.\n", __func__, ar->wmi);
wlan_node_table_init(&ar->scan_table);
/*
* The reason we have to wait for the target here is that the
* driver layer has to init BMI in order to set the host block
@ -1069,7 +1071,7 @@ static int ath6kl_init(struct net_device *dev)
*/
if (htc_wait_target(ar->htc_target)) {
status = -EIO;
goto err_wmi_cleanup;
goto err_node_cleanup;
}
if (ath6kl_init_service_ep(ar)) {
@ -1142,7 +1144,8 @@ err_rxbuf_cleanup:
ath6kl_cleanup_amsdu_rxbufs(ar);
err_cleanup_scatter:
ath6kl_hif_cleanup_scatter(ar);
err_wmi_cleanup:
err_node_cleanup:
wlan_node_table_cleanup(&ar->scan_table);
ath6kl_wmi_shutdown(ar->wmi);
clear_bit(WMI_ENABLED, &ar->flag);
ar->wmi = NULL;
@ -1289,5 +1292,7 @@ void ath6kl_destroy(struct net_device *dev, unsigned int unregister)
free_netdev(dev);
wlan_node_table_cleanup(&ar->scan_table);
ath6kl_cfg80211_deinit(ar);
}

2
drivers/net/wireless/ath/ath6kl/wmi.c
View File

@ -2727,7 +2727,6 @@ void *ath6kl_wmi_init(struct ath6kl *dev)
wmi->parent_dev = dev;
wlan_node_table_init(&dev->scan_table);
ath6kl_wmi_qos_state_init(wmi);
wmi->pwr_mode = REC_POWER;
@ -2747,6 +2746,5 @@ void ath6kl_wmi_shutdown(struct wmi *wmi)
if (!wmi)
return;
wlan_node_table_cleanup(&wmi->parent_dev->scan_table);
kfree(wmi);
}