Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Conflicts:
	drivers/net/wireless/ath/carl9170/debug.c
	drivers/net/wireless/ath/carl9170/main.c
	net/mac80211/ieee80211_i.h

1 files changed, 78 insertions, 38 deletions

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 69aaba79a9f7..146b1320af4e 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1,5 +1,5 @@
 /*
- * Interface handling (except master interface)
+ * Interface handling
  *
  * Copyright 2002-2005, Instant802 Networks, Inc.
  * Copyright 2005-2006, Devicescape Software, Inc.
@@ -346,7 +346,7 @@ static void ieee80211_set_default_queues(struct ieee80211_sub_if_data *sdata)
         sdata->vif.cab_queue = IEEE80211_INVAL_HW_QUEUE;
 }
 
-static int ieee80211_add_virtual_monitor(struct ieee80211_local *local)
+int ieee80211_add_virtual_monitor(struct ieee80211_local *local)
 {
         struct ieee80211_sub_if_data *sdata;
         int ret;
@@ -399,7 +399,7 @@ static int ieee80211_add_virtual_monitor(struct ieee80211_local *local)
         return 0;
 }
 
-static void ieee80211_del_virtual_monitor(struct ieee80211_local *local)
+void ieee80211_del_virtual_monitor(struct ieee80211_local *local)
 {
         struct ieee80211_sub_if_data *sdata;
 
@@ -584,7 +584,8 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
                 case NL80211_IFTYPE_P2P_DEVICE:
                         break;
                 default:
-                        netif_carrier_on(dev);
+                        /* not reached */
+                        WARN_ON(1);
                 }
 
                 /*
@@ -641,8 +642,28 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
 
         ieee80211_recalc_ps(local, -1);
 
-        if (dev)
-                netif_tx_start_all_queues(dev);
+        if (dev) {
+                unsigned long flags;
+                int n_acs = IEEE80211_NUM_ACS;
+                int ac;
+
+                if (local->hw.queues < IEEE80211_NUM_ACS)
+                        n_acs = 1;
+
+                spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
+                if (sdata->vif.cab_queue == IEEE80211_INVAL_HW_QUEUE ||
+                    (local->queue_stop_reasons[sdata->vif.cab_queue] == 0 &&
+                     skb_queue_empty(&local->pending[sdata->vif.cab_queue]))) {
+                        for (ac = 0; ac < n_acs; ac++) {
+                                int ac_queue = sdata->vif.hw_queue[ac];
+
+                                if (local->queue_stop_reasons[ac_queue] == 0 &&
+                                    skb_queue_empty(&local->pending[ac_queue]))
+                                        netif_start_subqueue(dev, ac);
+                        }
+                }
+                spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
+        }
 
         return 0;
  err_del_interface:
@@ -696,7 +717,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
         if (sdata->dev)
                 netif_tx_stop_all_queues(sdata->dev);
 
-        ieee80211_roc_purge(sdata);
+        ieee80211_roc_purge(local, sdata);
 
         if (sdata->vif.type == NL80211_IFTYPE_STATION)
                 ieee80211_mgd_stop(sdata);
@@ -721,12 +742,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
         WARN_ON_ONCE((sdata->vif.type != NL80211_IFTYPE_WDS && flushed > 0) ||
                      (sdata->vif.type == NL80211_IFTYPE_WDS && flushed != 1));
 
-        /*
-         * Don't count this interface for promisc/allmulti while it
-         * is down. dev_mc_unsync() will invoke set_multicast_list
-         * on the master interface which will sync these down to the
-         * hardware as filter flags.
-         */
+        /* don't count this interface for promisc/allmulti while it is down */
         if (sdata->flags & IEEE80211_SDATA_ALLMULTI)
                 atomic_dec(&local->iff_allmultis);
 
@@ -747,8 +763,6 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
                                  sdata->dev->addr_len);
                 spin_unlock_bh(&local->filter_lock);
                 netif_addr_unlock_bh(sdata->dev);
-
-                ieee80211_configure_filter(local);
         }
 
         del_timer_sync(&local->dynamic_ps_timer);
@@ -759,6 +773,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
         cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);
 
         if (sdata->wdev.cac_started) {
+                WARN_ON(local->suspended);
                 mutex_lock(&local->iflist_mtx);
                 ieee80211_vif_release_channel(sdata);
                 mutex_unlock(&local->iflist_mtx);
@@ -809,14 +824,9 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
                 if (local->monitors == 0) {
                         local->hw.conf.flags &= ~IEEE80211_CONF_MONITOR;
                         hw_reconf_flags |= IEEE80211_CONF_CHANGE_MONITOR;
-                        ieee80211_del_virtual_monitor(local);
                 }
 
                 ieee80211_adjust_monitor_flags(sdata, -1);
-                ieee80211_configure_filter(local);
-                mutex_lock(&local->mtx);
-                ieee80211_recalc_idle(local);
-                mutex_unlock(&local->mtx);
                 break;
         case NL80211_IFTYPE_P2P_DEVICE:
                 /* relies on synchronize_rcu() below */
@@ -846,27 +856,10 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
                 /* fall through */
         case NL80211_IFTYPE_AP:
                 skb_queue_purge(&sdata->skb_queue);
-
-                if (going_down)
-                        drv_remove_interface(local, sdata);
         }
 
         sdata->bss = NULL;
 
-        ieee80211_recalc_ps(local, -1);
-
-        if (local->open_count == 0) {
-                ieee80211_clear_tx_pending(local);
-                ieee80211_stop_device(local);
-
-                /* no reconfiguring after stop! */
-                hw_reconf_flags = 0;
-        }
-
-        /* do after stop to avoid reconfiguring when we stop anyway */
-        if (hw_reconf_flags)
-                ieee80211_hw_config(local, hw_reconf_flags);
-
         spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
         for (i = 0; i < IEEE80211_MAX_QUEUES; i++) {
                 skb_queue_walk_safe(&local->pending[i], skb, tmp) {
@@ -879,7 +872,54 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
         }
         spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
 
-        if (local->monitors == local->open_count && local->monitors > 0)
+        if (local->open_count == 0)
+                ieee80211_clear_tx_pending(local);
+
+        /*
+         * If the interface goes down while suspended, presumably because
+         * the device was unplugged and that happens before our resume,
+         * then the driver is already unconfigured and the remainder of
+         * this function isn't needed.
+         * XXX: what about WoWLAN? If the device has software state, e.g.
+         *      memory allocated, it might expect teardown commands from
+         *      mac80211 here?
+         */
+        if (local->suspended) {
+                WARN_ON(local->wowlan);
+                WARN_ON(rtnl_dereference(local->monitor_sdata));
+                return;
+        }
+
+        switch (sdata->vif.type) {
+        case NL80211_IFTYPE_AP_VLAN:
+                break;
+        case NL80211_IFTYPE_MONITOR:
+                if (local->monitors == 0)
+                        ieee80211_del_virtual_monitor(local);
+
+                mutex_lock(&local->mtx);
+                ieee80211_recalc_idle(local);
+                mutex_unlock(&local->mtx);
+                break;
+        default:
+                if (going_down)
+                        drv_remove_interface(local, sdata);
+        }
+
+        ieee80211_recalc_ps(local, -1);
+
+        if (local->open_count == 0) {
+                ieee80211_stop_device(local);
+
+                /* no reconfiguring after stop! */
+                return;
+        }
+
+        /* do after stop to avoid reconfiguring when we stop anyway */
+        ieee80211_configure_filter(local);
+        ieee80211_hw_config(local, hw_reconf_flags);
+
+        if (local->monitors == local->open_count)
                 ieee80211_add_virtual_monitor(local);
 }