2 files changed, 10 insertions, 29 deletions

diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index c06b6cb5c91e..7c899fc7ddd0 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -870,13 +870,6 @@ struct b43_wl {
          * handler, only. This basically is just the IRQ mask register. */
         spinlock_t hardirq_lock;
 
-        /* The number of queues that were registered with the mac80211 subsystem
-         * initially. This is a backup copy of hw->queues in case hw->queues has
-         * to be dynamically lowered at runtime (Firmware does not support QoS).
-         * hw->queues has to be restored to the original value before unregistering
-         * from the mac80211 subsystem. */
-        u16 mac80211_initially_registered_queues;
-
         /* Set this if we call ieee80211_register_hw() and check if we call
          * ieee80211_unregister_hw(). */
         bool hw_registred;
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index acd03a4f9730..3e5cd8d7d01f 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2359,6 +2359,8 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
         if (err)
                 goto err_load;
 
+        fw->opensource = (ctx->req_type == B43_FWTYPE_OPENSOURCE);
+
         return 0;
 
 err_no_ucode:
@@ -2434,6 +2436,10 @@ static void b43_request_firmware(struct work_struct *work)
         goto out;
 
 start_ieee80211:
+        wl->hw->queues = B43_QOS_QUEUE_NUM;
+        if (!modparam_qos || dev->fw.opensource)
+                wl->hw->queues = 1;
+
         err = ieee80211_register_hw(wl->hw);
         if (err)
                 goto err_one_core_detach;
@@ -2537,11 +2543,9 @@ static int b43_upload_microcode(struct b43_wldev *dev)
                 dev->fw.hdr_format = B43_FW_HDR_410;
         else
                 dev->fw.hdr_format = B43_FW_HDR_351;
-        dev->fw.opensource = (fwdate == 0xFFFF);
+        WARN_ON(dev->fw.opensource != (fwdate == 0xFFFF));
 
-        /* Default to use-all-queues. */
-        dev->wl->hw->queues = dev->wl->mac80211_initially_registered_queues;
-        dev->qos_enabled = !!modparam_qos;
+        dev->qos_enabled = dev->wl->hw->queues > 1;
         /* Default to firmware/hardware crypto acceleration. */
         dev->hwcrypto_enabled = true;
 
@@ -2559,14 +2563,8 @@ static int b43_upload_microcode(struct b43_wldev *dev)
                         /* Disable hardware crypto and fall back to software crypto. */
                         dev->hwcrypto_enabled = false;
                 }
-                if (!(fwcapa & B43_FWCAPA_QOS)) {
-                        b43info(dev->wl, "QoS not supported by firmware\n");
-                        /* Disable QoS. Tweak hw->queues to 1. It will be restored before
-                         * ieee80211_unregister to make sure the networking core can
-                         * properly free possible resources. */
-                        dev->wl->hw->queues = 1;
-                        dev->qos_enabled = false;
-                }
+                /* adding QoS support should use an offline discovery mechanism */
+                WARN(fwcapa & B43_FWCAPA_QOS, "QoS in OpenFW not supported\n");
         } else {
                 b43info(dev->wl, "Loading firmware version %u.%u "
                         "(20%.2i-%.2i-%.2i %.2i:%.2i:%.2i)\n",
@@ -5298,8 +5296,6 @@ static struct b43_wl *b43_wireless_init(struct b43_bus_dev *dev)
 
         hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
 
-        hw->queues = modparam_qos ? B43_QOS_QUEUE_NUM : 1;
-        wl->mac80211_initially_registered_queues = hw->queues;
         wl->hw_registred = false;
         hw->max_rates = 2;
         SET_IEEE80211_DEV(hw, dev->dev);
@@ -5374,10 +5370,6 @@ static void b43_bcma_remove(struct bcma_device *core)
 
         B43_WARN_ON(!wl);
         if (wl->current_dev == wldev && wl->hw_registred) {
-                /* Restore the queues count before unregistering, because firmware detect
-                 * might have modified it. Restoring is important, so the networking
-                 * stack can properly free resources. */
-                wl->hw->queues = wl->mac80211_initially_registered_queues;
                 b43_leds_stop(wldev);
                 ieee80211_unregister_hw(wl->hw);
         }
@@ -5452,10 +5444,6 @@ static void b43_ssb_remove(struct ssb_device *sdev)
 
         B43_WARN_ON(!wl);
         if (wl->current_dev == wldev && wl->hw_registred) {
-                /* Restore the queues count before unregistering, because firmware detect
-                 * might have modified it. Restoring is important, so the networking
-                 * stack can properly free resources. */
-                wl->hw->queues = wl->mac80211_initially_registered_queues;
                 b43_leds_stop(wldev);
                 ieee80211_unregister_hw(wl->hw);
         }