[PATCH] ath9k_htc: Use proper station add/remove callbacks

[PATCH] ath9k_htc: Use proper station add/remove callbacks

[Sujith]

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

Sigh. What a dumb fsckup.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
---
 drivers/net/wireless/ath/ath9k/htc_drv_main.c |   39 ++++++++++++++-----------
 1 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index 6d46423..340d281 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -1438,30 +1438,34 @@ static void ath9k_htc_configure_filter(struct ieee80211_hw *hw,
 	mutex_unlock(&priv->mutex);
 }
 
-static void ath9k_htc_sta_notify(struct ieee80211_hw *hw,
-				 struct ieee80211_vif *vif,
-				 enum sta_notify_cmd cmd,
-				 struct ieee80211_sta *sta)
+static int ath9k_htc_sta_add(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);
+	ret = ath9k_htc_add_station(priv, vif, sta);
+	if (!ret)
+		ath9k_htc_init_rate(priv, sta);
+	mutex_unlock(&priv->mutex);
 
-	switch (cmd) {
-	case STA_NOTIFY_ADD:
-		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;
-	}
+	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);
+	ret = ath9k_htc_remove_station(priv, vif, sta);
 	mutex_unlock(&priv->mutex);
+
+	return ret;
 }
 
 static int ath9k_htc_conf_tx(struct ieee80211_hw *hw, u16 queue,
@@ -1756,7 +1760,8 @@ struct ieee80211_ops ath9k_htc_ops = {
 	.remove_interface   = ath9k_htc_remove_interface,
 	.config             = ath9k_htc_config,
 	.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,
 	.bss_info_changed   = ath9k_htc_bss_info_changed,
 	.set_key            = ath9k_htc_set_key,
-- 
1.7.1

Re: [PATCH] ath9k_htc: Use proper station add/remove callbacks

[Johannes Berg]

On Tue, 2010-05-18 at 15:26 +0530, Sujith wrote:
> sta_add/sta_remove are the callbacks that can sleep.
> Use them instead of sta_notify.
> 
> Sigh. What a dumb fsckup.

Not really your fault? The sleeping ones are quite new.

johannes

Re: [PATCH] ath9k_htc: Use proper station add/remove callbacks

[Luis R. Rodriguez]

On Tue, May 18, 2010 at 4:13 AM, Johannes Berg
<johannes@sipsolutions.net> wrote:
> On Tue, 2010-05-18 at 15:26 +0530, Sujith wrote:
>> sta_add/sta_remove are the callbacks that can sleep.
>> Use them instead of sta_notify.
>>
>> Sigh. What a dumb fsckup.
>
> Not really your fault? The sleeping ones are quite new.

John, this fix might be a 2.6.35 fix although not noted as such.

  Luis