1 files changed, 54 insertions, 12 deletions

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index d2661aaff50f..d2b1d1fe202b 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -66,7 +66,6 @@ MODULE_AUTHOR("Michael Buesch");
 MODULE_AUTHOR("Gábor Stefanik");
 MODULE_LICENSE("GPL");
 
-MODULE_FIRMWARE(B43_SUPPORTED_FIRMWARE_ID);
 MODULE_FIRMWARE("b43/ucode11.fw");
 MODULE_FIRMWARE("b43/ucode13.fw");
 MODULE_FIRMWARE("b43/ucode14.fw");
@@ -108,7 +107,7 @@ int b43_modparam_verbose = B43_VERBOSITY_DEFAULT;
 module_param_named(verbose, b43_modparam_verbose, int, 0644);
 MODULE_PARM_DESC(verbose, "Log message verbosity: 0=error, 1=warn, 2=info(default), 3=debug");
 
-static int b43_modparam_pio = B43_PIO_DEFAULT;
+static int b43_modparam_pio = 0;
 module_param_named(pio, b43_modparam_pio, int, 0644);
 MODULE_PARM_DESC(pio, "Use PIO accesses by default: 0=DMA, 1=PIO");
 
@@ -320,6 +319,10 @@ static void b43_wireless_core_exit(struct b43_wldev *dev);
 static int b43_wireless_core_init(struct b43_wldev *dev);
 static struct b43_wldev * b43_wireless_core_stop(struct b43_wldev *dev);
 static int b43_wireless_core_start(struct b43_wldev *dev);
+static void b43_op_bss_info_changed(struct ieee80211_hw *hw,
+                                    struct ieee80211_vif *vif,
+                                    struct ieee80211_bss_conf *conf,
+                                    u32 changed);
 
 static int b43_ratelimit(struct b43_wl *wl)
 {
@@ -2510,6 +2513,12 @@ static int b43_upload_microcode(struct b43_wldev *dev)
         }
         dev->fw.rev = fwrev;
         dev->fw.patch = fwpatch;
+        if (dev->fw.rev >= 598)
+                dev->fw.hdr_format = B43_FW_HDR_598;
+        else if (dev->fw.rev >= 410)
+                dev->fw.hdr_format = B43_FW_HDR_410;
+        else
+                dev->fw.hdr_format = B43_FW_HDR_351;
         dev->fw.opensource = (fwdate == 0xFFFF);
 
         /* Default to use-all-queues. */
@@ -2557,7 +2566,7 @@ static int b43_upload_microcode(struct b43_wldev *dev)
                         dev->fw.rev, dev->fw.patch);
         wiphy->hw_version = dev->dev->core_id;
 
-        if (b43_is_old_txhdr_format(dev)) {
+        if (dev->fw.hdr_format == B43_FW_HDR_351) {
                 /* We're over the deadline, but we keep support for old fw
                  * until it turns out to be in major conflict with something new. */
                 b43warn(dev->wl, "You are using an old firmware image. "
@@ -2943,6 +2952,7 @@ static void b43_rate_memory_init(struct b43_wldev *dev)
         case B43_PHYTYPE_G:
         case B43_PHYTYPE_N:
         case B43_PHYTYPE_LP:
+        case B43_PHYTYPE_HT:
                 b43_rate_memory_write(dev, B43_OFDM_RATE_6MB, 1);
                 b43_rate_memory_write(dev, B43_OFDM_RATE_12MB, 1);
                 b43_rate_memory_write(dev, B43_OFDM_RATE_18MB, 1);
@@ -3778,14 +3788,24 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
         struct ieee80211_conf *conf = &hw->conf;
         int antenna;
         int err = 0;
+        bool reload_bss = false;
 
         mutex_lock(&wl->mutex);
 
+        dev = wl->current_dev;
+
         /* Switch the band (if necessary). This might change the active core. */
         err = b43_switch_band(wl, conf->channel);
         if (err)
                 goto out_unlock_mutex;
-        dev = wl->current_dev;
+
+        /* Need to reload all settings if the core changed */
+        if (dev != wl->current_dev) {
+                dev = wl->current_dev;
+                changed = ~0;
+                reload_bss = true;
+        }
+
         phy = &dev->phy;
 
         if (conf_is_ht(conf))
@@ -3846,6 +3866,9 @@ out_mac_enable:
 out_unlock_mutex:
         mutex_unlock(&wl->mutex);
 
+        if (wl->vif && reload_bss)
+                b43_op_bss_info_changed(hw, wl->vif, &wl->vif->bss_conf, ~0);
+
         return err;
 }
 
@@ -3934,7 +3957,8 @@ static void b43_op_bss_info_changed(struct ieee80211_hw *hw,
         if (changed & BSS_CHANGED_BEACON_INT &&
             (b43_is_mode(wl, NL80211_IFTYPE_AP) ||
              b43_is_mode(wl, NL80211_IFTYPE_MESH_POINT) ||
-             b43_is_mode(wl, NL80211_IFTYPE_ADHOC)))
+             b43_is_mode(wl, NL80211_IFTYPE_ADHOC)) &&
+            conf->beacon_int)
                 b43_set_beacon_int(dev, conf->beacon_int);
 
         if (changed & BSS_CHANGED_BASIC_RATES)
@@ -4629,8 +4653,13 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
         b43_shm_write16(dev, B43_SHM_SCRATCH, B43_SHM_SC_MAXCONT, 0x3FF);
 
         if (b43_bus_host_is_pcmcia(dev->dev) ||
-            b43_bus_host_is_sdio(dev->dev) ||
-            dev->use_pio) {
+            b43_bus_host_is_sdio(dev->dev)) {
+                dev->__using_pio_transfers = 1;
+                err = b43_pio_init(dev);
+        } else if (dev->use_pio) {
+                b43warn(dev->wl, "Forced PIO by use_pio module parameter. "
+                        "This should not be needed and will result in lower "
+                        "performance.\n");
                 dev->__using_pio_transfers = 1;
                 err = b43_pio_init(dev);
         } else {
@@ -4702,6 +4731,9 @@ static int b43_op_add_interface(struct ieee80211_hw *hw,
  out_mutex_unlock:
         mutex_unlock(&wl->mutex);
 
+        if (err == 0)
+                b43_op_bss_info_changed(hw, vif, &vif->bss_conf, ~0);
+
         return err;
 }
 
@@ -4772,6 +4804,9 @@ static int b43_op_start(struct ieee80211_hw *hw)
  out_mutex_unlock:
         mutex_unlock(&wl->mutex);
 
+        /* reload configuration */
+        b43_op_config(hw, ~0);
+
         return err;
 }
 
@@ -4928,10 +4963,18 @@ out:
         if (err)
                 wl->current_dev = NULL; /* Failed to init the dev. */
         mutex_unlock(&wl->mutex);
-        if (err)
+
+        if (err) {
                 b43err(wl, "Controller restart FAILED\n");
-        else
-                b43info(wl, "Controller restarted\n");
+                return;
+        }
+
+        /* reload configuration */
+        b43_op_config(wl->hw, ~0);
+        if (wl->vif)
+                b43_op_bss_info_changed(wl->hw, wl->vif, &wl->vif->bss_conf, ~0);
+
+        b43info(wl, "Controller restarted\n");
 }
 
 static int b43_setup_bands(struct b43_wldev *dev,
@@ -5416,8 +5459,7 @@ static void b43_print_driverinfo(void)
         feat_sdio = "S";
 #endif
         printk(KERN_INFO "Broadcom 43xx driver loaded "
-               "[ Features: %s%s%s%s%s, Firmware-ID: "
-               B43_SUPPORTED_FIRMWARE_ID " ]\n",
+               "[ Features: %s%s%s%s%s ]\n",
                feat_pci, feat_pcmcia, feat_nphy,
                feat_leds, feat_sdio);
 }