mac80211: add ieee80211_sdata_running
[linux-2.6.git] / net / mac80211 / pm.c
index 6d17ed7..913dc7e 100644 (file)
@@ -2,6 +2,8 @@
 #include <net/rtnetlink.h>
 
 #include "ieee80211_i.h"
+#include "mesh.h"
+#include "driver-ops.h"
 #include "led.h"
 
 int __ieee80211_suspend(struct ieee80211_hw *hw)
@@ -10,105 +12,114 @@ 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;
 
-       flush_workqueue(local->hw.workqueue);
+       ieee80211_scan_cancel(local);
 
-       /* disable keys */
-       list_for_each_entry(sdata, &local->interfaces, list)
-               ieee80211_disable_keys(sdata);
-
-       /* remove STAs */
-       list_for_each_entry(sta, &local->sta_list, list) {
+       ieee80211_stop_queues_by_reason(hw,
+                       IEEE80211_QUEUE_STOP_REASON_SUSPEND);
 
-               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);
+       /* flush out all packets */
+       synchronize_net();
 
-                       local->ops->sta_notify(hw, &sdata->vif,
-                               STA_NOTIFY_REMOVE, &sta->sta);
-               }
-       }
+       local->quiescing = true;
+       /* make quiescing visible to timers everywhere */
+       mb();
 
-       /* remove all interfaces */
-       list_for_each_entry(sdata, &local->interfaces, list) {
+       flush_workqueue(local->workqueue);
 
-               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;
-                       local->ops->remove_interface(hw, &conf);
-               }
-       }
+       /* Don't try to run timers while suspended. */
+       del_timer_sync(&local->sta_cleanup);
 
-       /* stop hardware */
-       if (local->open_count) {
-               ieee80211_led_radio(local, false);
-               local->ops->stop(hw);
-       }
-       return 0;
-}
+        /*
+        * Note that this particular timer doesn't need to be
+        * restarted at resume.
+        */
+       cancel_work_sync(&local->dynamic_ps_enable_work);
+       del_timer_sync(&local->dynamic_ps_timer);
 
-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);
+       /* disable keys */
+       list_for_each_entry(sdata, &local->interfaces, list)
+               ieee80211_disable_keys(sdata);
 
-               ieee80211_led_radio(local, hw->conf.radio_enabled);
-       }
+       /* Tear down aggregation sessions */
 
-       /* add interfaces */
-       list_for_each_entry(sdata, &local->interfaces, list) {
+       rcu_read_lock();
 
-               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);
+       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);
                }
        }
 
-       /* add STAs back */
-       list_for_each_entry(sta, &local->sta_list, list) {
+       rcu_read_unlock();
 
+       /* remove STAs */
+       spin_lock_irqsave(&local->sta_lock, flags);
+       list_for_each_entry(sta, &local->sta_list, list) {
                if (local->ops->sta_notify) {
+                       sdata = sta->sdata;
                        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);
+                       drv_sta_notify(local, sdata, STA_NOTIFY_REMOVE,
+                                      &sta->sta);
                }
+
+               mesh_plink_quiesce(sta);
        }
+       spin_unlock_irqrestore(&local->sta_lock, flags);
 
-       /* add back keys */
-       list_for_each_entry(sdata, &local->interfaces, list)
-               if (netif_running(sdata->dev))
-                       ieee80211_enable_keys(sdata);
+       /* remove all interfaces */
+       list_for_each_entry(sdata, &local->interfaces, list) {
+               switch(sdata->vif.type) {
+               case NL80211_IFTYPE_STATION:
+                       ieee80211_sta_quiesce(sdata);
+                       break;
+               case NL80211_IFTYPE_ADHOC:
+                       ieee80211_ibss_quiesce(sdata);
+                       break;
+               case NL80211_IFTYPE_MESH_POINT:
+                       ieee80211_mesh_quiesce(sdata);
+                       break;
+               case NL80211_IFTYPE_AP_VLAN:
+               case NL80211_IFTYPE_MONITOR:
+                       /* don't tell driver about this */
+                       continue;
+               default:
+                       break;
+               }
+
+               if (!ieee80211_sdata_running(sdata))
+                       continue;
 
-       /* setup RTS threshold */
-       if (local->ops->set_rts_threshold)
-               local->ops->set_rts_threshold(hw, local->rts_threshold);
+               /* disable beaconing */
+               ieee80211_bss_info_change_notify(sdata,
+                       BSS_CHANGED_BEACON_ENABLED);
 
-       /* reconfigure hardware */
-       ieee80211_hw_config(local, ~0);
+               conf.vif = &sdata->vif;
+               conf.type = sdata->vif.type;
+               conf.mac_addr = sdata->vif.addr;
+               drv_remove_interface(local, &conf);
+       }
 
-       netif_addr_lock_bh(local->mdev);
-       ieee80211_configure_filter(local);
-       netif_addr_unlock_bh(local->mdev);
+       /* stop hardware - this must stop RX */
+       if (local->open_count)
+               ieee80211_stop_device(local);
+
+       local->suspended = true;
+       /* need suspended to be visible before quiescing is false */
+       barrier();
+       local->quiescing = false;
 
        return 0;
 }
+
+/*
+ * __ieee80211_resume() is a static inline which just calls
+ * ieee80211_reconfig(), which is also needed for hardware
+ * hang/firmware failure/etc. recovery.
+ */