mac80211: add hardware restart function

[deliverable/linux.git] / net / mac80211 / pm.c

diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
index 44525f51707733f47ed10704828387690e023ca9..b38986c9deef4c443787f8dcfbbb858709914544 100644 (file)
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
@@ -10,6 +10,10 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
        struct ieee80211_sub_if_data *sdata;
        struct ieee80211_if_init_conf conf;
        struct sta_info *sta;
+       unsigned long flags;
+
+       ieee80211_stop_queues_by_reason(hw,
+                       IEEE80211_QUEUE_STOP_REASON_SUSPEND);
 
        flush_workqueue(local->hw.workqueue);
 
@@ -17,10 +21,23 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
        list_for_each_entry(sdata, &local->interfaces, list)
                ieee80211_disable_keys(sdata);
 
-       /* remove STAs */
-       list_for_each_entry(sta, &local->sta_list, list) {
+       /* Tear down aggregation sessions */
+
+       rcu_read_lock();
+
+       if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) {
+               list_for_each_entry_rcu(sta, &local->sta_list, list) {
+                       set_sta_flags(sta, WLAN_STA_SUSPEND);
+                       ieee80211_sta_tear_down_BA_sessions(sta);
+               }
+       }
 
-               if (local->ops->sta_notify) {
+       rcu_read_unlock();
+
+       /* remove STAs */
+       if (local->ops->sta_notify) {
+               spin_lock_irqsave(&local->sta_lock, flags);
+               list_for_each_entry(sta, &local->sta_list, list) {
                        if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
                                sdata = container_of(sdata->bss,
                                             struct ieee80211_sub_if_data,
@@ -29,11 +46,11 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
                        local->ops->sta_notify(hw, &sdata->vif,
                                STA_NOTIFY_REMOVE, &sta->sta);
                }
+               spin_unlock_irqrestore(&local->sta_lock, flags);
        }
 
        /* remove all interfaces */
        list_for_each_entry(sdata, &local->interfaces, list) {
-
                if (sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
                    sdata->vif.type != NL80211_IFTYPE_MONITOR &&
                    netif_running(sdata->dev)) {
@@ -55,63 +72,8 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
        return 0;
 }
 
-int __ieee80211_resume(struct ieee80211_hw *hw)
-{
-       struct ieee80211_local *local = hw_to_local(hw);
-       struct ieee80211_sub_if_data *sdata;
-       struct ieee80211_if_init_conf conf;
-       struct sta_info *sta;
-       int res;
-
-       /* restart hardware */
-       if (local->open_count) {
-               res = local->ops->start(hw);
-
-               ieee80211_led_radio(local, hw->conf.radio_enabled);
-       }
-
-       /* add interfaces */
-       list_for_each_entry(sdata, &local->interfaces, list) {
-
-               if (sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
-                   sdata->vif.type != NL80211_IFTYPE_MONITOR &&
-                   netif_running(sdata->dev)) {
-                       conf.vif = &sdata->vif;
-                       conf.type = sdata->vif.type;
-                       conf.mac_addr = sdata->dev->dev_addr;
-                       res = local->ops->add_interface(hw, &conf);
-               }
-       }
-
-       /* add STAs back */
-       list_for_each_entry(sta, &local->sta_list, list) {
-
-               if (local->ops->sta_notify) {
-                       if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
-                               sdata = container_of(sdata->bss,
-                                            struct ieee80211_sub_if_data,
-                                            u.ap);
-
-                       local->ops->sta_notify(hw, &sdata->vif,
-                               STA_NOTIFY_ADD, &sta->sta);
-               }
-       }
-
-       /* add back keys */
-       list_for_each_entry(sdata, &local->interfaces, list)
-               if (netif_running(sdata->dev))
-                       ieee80211_enable_keys(sdata);
-
-       /* setup RTS threshold */
-       if (local->ops->set_rts_threshold)
-               local->ops->set_rts_threshold(hw, local->rts_threshold);
-
-       /* reconfigure hardware */
-       ieee80211_hw_config(local, ~0);
-
-       netif_addr_lock_bh(local->mdev);
-       ieee80211_configure_filter(local);
-       netif_addr_unlock_bh(local->mdev);
-
-       return 0;
-}
+/*
+ * __ieee80211_resume() is a static inline which just calls
+ * ieee80211_reconfig(), which is also needed for hardware
+ * hang/firmware failure/etc. recovery.
+ */