ar9170: convert to new station add/remove callbacks

This converts ar9170 to use the new station
add/remove callbacks instead of using the
old sta_notify callback.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

drivers/net/wireless/ath/ar9170/main.c

@@ -2329,21 +2329,18 @@ static int ar9170_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 	return err;
 }
 
-static void ar9170_sta_notify(struct ieee80211_hw *hw,
+static int ar9170_sta_add(struct ieee80211_hw *hw,
 			  struct ieee80211_vif *vif,
-			      enum sta_notify_cmd cmd,
 			  struct ieee80211_sta *sta)
 {
 	struct ar9170 *ar = hw->priv;
 	struct ar9170_sta_info *sta_info = (void *) sta->drv_priv;
 	unsigned int i;
 
-	switch (cmd) {
-	case STA_NOTIFY_ADD:
 	memset(sta_info, 0, sizeof(*sta_info));
 
 	if (!sta->ht_cap.ht_supported)
-			break;
+		return 0;
 
 	if (sta->ht_cap.ampdu_density > ar->global_ampdu_density)
 		ar->global_ampdu_density = sta->ht_cap.ampdu_density;
@@ -2361,22 +2358,26 @@ static void ar9170_sta_notify(struct ieee80211_hw *hw,
 	}
 
 	sta_info->ampdu_max_len = 1 << (3 + sta->ht_cap.ampdu_factor);
-		break;
 
-	case STA_NOTIFY_REMOVE:
+	return 0;
+}
+
+static int ar9170_sta_remove(struct ieee80211_hw *hw,
+			     struct ieee80211_vif *vif,
+			     struct ieee80211_sta *sta)
+{
+	struct ar9170_sta_info *sta_info = (void *) sta->drv_priv;
+	unsigned int i;
+
 	if (!sta->ht_cap.ht_supported)
-			break;
+		return 0;
 
 	for (i = 0; i < AR9170_NUM_TID; i++) {
 		sta_info->agg[i].state = AR9170_TID_STATE_INVALID;
 		skb_queue_purge(&sta_info->agg[i].queue);
 	}
 
-		break;
-
-	default:
-		break;
-	}
+	return 0;
 }
 
 static int ar9170_get_stats(struct ieee80211_hw *hw,
@@ -2495,7 +2496,8 @@ static const struct ieee80211_ops ar9170_ops = {
 	.bss_info_changed	= ar9170_op_bss_info_changed,
 	.get_tsf		= ar9170_op_get_tsf,
 	.set_key		= ar9170_set_key,
-	.sta_notify		= ar9170_sta_notify,
+	.sta_add		= ar9170_sta_add,
+	.sta_remove		= ar9170_sta_remove,
 	.get_stats		= ar9170_get_stats,
 	.ampdu_action		= ar9170_ampdu_action,
 };