lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ath9k_htc: Use proper station add/remove callbacks

Browse Source 
sta_add/sta_remove are the callbacks that can sleep.
Use them instead of sta_notify.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Sujith
2010-05-18 15:26:04 +05:30
committed by John W. Linville
parent 9d1ac34ec3
commit abd984e611
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/net/wireless/ath/ath9k/htc_drv_main.c
View File

@@ -1516,32 +1516,38 @@ static void ath9k_htc_configure_filter(struct ieee80211_hw *hw,
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);
} }
static void ath9k_htc_sta_notify(struct ieee80211_hw *hw, static int ath9k_htc_sta_add(struct ieee80211_hw *hw,
struct ieee80211_vif *vif, struct ieee80211_vif *vif,
enum sta_notify_cmd cmd, struct ieee80211_sta *sta)
struct ieee80211_sta *sta)
{ {
struct ath9k_htc_priv *priv = hw->priv; struct ath9k_htc_priv *priv = hw->priv;
int ret; int ret;
mutex_lock(&priv->mutex); mutex_lock(&priv->mutex);
ath9k_htc_ps_wakeup(priv); ath9k_htc_ps_wakeup(priv);
ret = ath9k_htc_add_station(priv, vif, sta);
switch (cmd) { if (!ret)
case STA_NOTIFY_ADD: ath9k_htc_init_rate(priv, sta);
ret = ath9k_htc_add_station(priv, vif, sta);
if (!ret)
ath9k_htc_init_rate(priv, sta);
break;
case STA_NOTIFY_REMOVE:
ath9k_htc_remove_station(priv, vif, sta);
break;
default:
break;
}
ath9k_htc_ps_restore(priv); ath9k_htc_ps_restore(priv);
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);
return ret;
}
static int ath9k_htc_sta_remove(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
struct ieee80211_sta *sta)
{
struct ath9k_htc_priv *priv = hw->priv;
int ret;
mutex_lock(&priv->mutex);
ath9k_htc_ps_wakeup(priv);
ret = ath9k_htc_remove_station(priv, vif, sta);
ath9k_htc_ps_restore(priv);
mutex_unlock(&priv->mutex);
return ret;
} }
static int ath9k_htc_conf_tx(struct ieee80211_hw *hw, u16 queue, static int ath9k_htc_conf_tx(struct ieee80211_hw *hw, u16 queue,
@@ -1849,7 +1855,8 @@ struct ieee80211_ops ath9k_htc_ops = {
.remove_interface = ath9k_htc_remove_interface, .remove_interface = ath9k_htc_remove_interface,
.config = ath9k_htc_config, .config = ath9k_htc_config,
.configure_filter = ath9k_htc_configure_filter, .configure_filter = ath9k_htc_configure_filter,
.sta_notify = ath9k_htc_sta_notify, .sta_add = ath9k_htc_sta_add,
.sta_remove = ath9k_htc_sta_remove,
.conf_tx = ath9k_htc_conf_tx, .conf_tx = ath9k_htc_conf_tx,
.bss_info_changed = ath9k_htc_bss_info_changed, .bss_info_changed = ath9k_htc_bss_info_changed,
.set_key = ath9k_htc_set_key, .set_key = ath9k_htc_set_key,