Commit c25889e8 authored by Kalle Valo's avatar Kalle Valo

ath6kl: rename vif init and cleanup functions

ath6kl_cfg80211_vif_init/cleanup() follow more closely the style used
elsewhere in ath6kl.
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent cd23c1c9
...@@ -1401,7 +1401,7 @@ static int ath6kl_cfg80211_del_iface(struct wiphy *wiphy, ...@@ -1401,7 +1401,7 @@ static int ath6kl_cfg80211_del_iface(struct wiphy *wiphy,
ath6kl_cleanup_vif(vif, test_bit(WMI_READY, &ar->flag)); ath6kl_cleanup_vif(vif, test_bit(WMI_READY, &ar->flag));
ath6kl_deinit_if_data(vif); ath6kl_cfg80211_vif_cleanup(vif);
return 0; return 0;
} }
...@@ -2806,7 +2806,7 @@ int ath6kl_register_ieee80211_hw(struct ath6kl *ar) ...@@ -2806,7 +2806,7 @@ int ath6kl_register_ieee80211_hw(struct ath6kl *ar)
return 0; return 0;
} }
static int ath6kl_init_if_data(struct ath6kl_vif *vif) static int ath6kl_cfg80211_vif_init(struct ath6kl_vif *vif)
{ {
vif->aggr_cntxt = aggr_init(vif->ndev); vif->aggr_cntxt = aggr_init(vif->ndev);
if (!vif->aggr_cntxt) { if (!vif->aggr_cntxt) {
...@@ -2827,7 +2827,7 @@ static int ath6kl_init_if_data(struct ath6kl_vif *vif) ...@@ -2827,7 +2827,7 @@ static int ath6kl_init_if_data(struct ath6kl_vif *vif)
return 0; return 0;
} }
void ath6kl_deinit_if_data(struct ath6kl_vif *vif) void ath6kl_cfg80211_vif_cleanup(struct ath6kl_vif *vif)
{ {
struct ath6kl *ar = vif->ar; struct ath6kl *ar = vif->ar;
struct ath6kl_mc_filter *mc_filter, *tmp; struct ath6kl_mc_filter *mc_filter, *tmp;
...@@ -2880,8 +2880,7 @@ struct net_device *ath6kl_interface_add(struct ath6kl *ar, char *name, ...@@ -2880,8 +2880,7 @@ struct net_device *ath6kl_interface_add(struct ath6kl *ar, char *name,
ath6kl_init_control_info(vif); ath6kl_init_control_info(vif);
/* TODO: Pass interface specific pointer instead of ar */ if (ath6kl_cfg80211_vif_init(vif))
if (ath6kl_init_if_data(vif))
goto err; goto err;
if (register_netdevice(ndev)) if (register_netdevice(ndev))
......
...@@ -53,6 +53,8 @@ int ath6kl_cfg80211_suspend(struct ath6kl *ar, ...@@ -53,6 +53,8 @@ int ath6kl_cfg80211_suspend(struct ath6kl *ar,
int ath6kl_cfg80211_resume(struct ath6kl *ar); int ath6kl_cfg80211_resume(struct ath6kl *ar);
void ath6kl_cfg80211_vif_cleanup(struct ath6kl_vif *vif);
void ath6kl_cfg80211_stop(struct ath6kl_vif *vif); void ath6kl_cfg80211_stop(struct ath6kl_vif *vif);
void ath6kl_cfg80211_stop_all(struct ath6kl *ar); void ath6kl_cfg80211_stop_all(struct ath6kl *ar);
......
...@@ -753,7 +753,6 @@ void ath6kl_wakeup_event(void *dev); ...@@ -753,7 +753,6 @@ void ath6kl_wakeup_event(void *dev);
void ath6kl_reset_device(struct ath6kl *ar, u32 target_type, void ath6kl_reset_device(struct ath6kl *ar, u32 target_type,
bool wait_fot_compltn, bool cold_reset); bool wait_fot_compltn, bool cold_reset);
void ath6kl_init_control_info(struct ath6kl_vif *vif); void ath6kl_init_control_info(struct ath6kl_vif *vif);
void ath6kl_deinit_if_data(struct ath6kl_vif *vif);
void ath6kl_core_free(struct ath6kl *ar); void ath6kl_core_free(struct ath6kl *ar);
struct ath6kl_vif *ath6kl_vif_first(struct ath6kl *ar); struct ath6kl_vif *ath6kl_vif_first(struct ath6kl *ar);
void ath6kl_cleanup_vif(struct ath6kl_vif *vif, bool wmi_ready); void ath6kl_cleanup_vif(struct ath6kl_vif *vif, bool wmi_ready);
......
...@@ -1811,7 +1811,7 @@ int ath6kl_core_init(struct ath6kl *ar) ...@@ -1811,7 +1811,7 @@ int ath6kl_core_init(struct ath6kl *ar)
ath6kl_htc_flush_rx_buf(ar->htc_target); ath6kl_htc_flush_rx_buf(ar->htc_target);
ath6kl_cleanup_amsdu_rxbufs(ar); ath6kl_cleanup_amsdu_rxbufs(ar);
rtnl_lock(); rtnl_lock();
ath6kl_deinit_if_data(netdev_priv(ndev)); ath6kl_cfg80211_vif_cleanup(netdev_priv(ndev));
rtnl_unlock(); rtnl_unlock();
wiphy_unregister(ar->wiphy); wiphy_unregister(ar->wiphy);
err_debug_init: err_debug_init:
...@@ -1832,6 +1832,7 @@ int ath6kl_core_init(struct ath6kl *ar) ...@@ -1832,6 +1832,7 @@ int ath6kl_core_init(struct ath6kl *ar)
return ret; return ret;
} }
/* FIXME: move this to cfg80211.c and rename to ath6kl_cfg80211_vif_stop() */
void ath6kl_cleanup_vif(struct ath6kl_vif *vif, bool wmi_ready) void ath6kl_cleanup_vif(struct ath6kl_vif *vif, bool wmi_ready)
{ {
static u8 bcast_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; static u8 bcast_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
...@@ -1877,7 +1878,7 @@ void ath6kl_stop_txrx(struct ath6kl *ar) ...@@ -1877,7 +1878,7 @@ void ath6kl_stop_txrx(struct ath6kl *ar)
spin_unlock_bh(&ar->list_lock); spin_unlock_bh(&ar->list_lock);
ath6kl_cleanup_vif(vif, test_bit(WMI_READY, &ar->flag)); ath6kl_cleanup_vif(vif, test_bit(WMI_READY, &ar->flag));
rtnl_lock(); rtnl_lock();
ath6kl_deinit_if_data(vif); ath6kl_cfg80211_vif_cleanup(vif);
rtnl_unlock(); rtnl_unlock();
spin_lock_bh(&ar->list_lock); spin_lock_bh(&ar->list_lock);
} }
......
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