1 files changed, 59 insertions, 44 deletions

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index ba7a5ab7fe1d..7b31a327b24a 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -992,6 +992,52 @@ static void b43_clear_keys(struct b43_wldev *dev)
                 b43_key_clear(dev, i);
 }
 
+static void b43_dump_keymemory(struct b43_wldev *dev)
+{
+        unsigned int i, index, offset;
+        DECLARE_MAC_BUF(macbuf);
+        u8 mac[ETH_ALEN];
+        u16 algo;
+        u32 rcmta0;
+        u16 rcmta1;
+        u64 hf;
+        struct b43_key *key;
+
+        if (!b43_debug(dev, B43_DBG_KEYS))
+                return;
+
+        hf = b43_hf_read(dev);
+        b43dbg(dev->wl, "Hardware key memory dump:  USEDEFKEYS=%u\n",
+               !!(hf & B43_HF_USEDEFKEYS));
+        for (index = 0; index < dev->max_nr_keys; index++) {
+                key = &(dev->key[index]);
+                printk(KERN_DEBUG "Key slot %02u: %s",
+                       index, (key->keyconf == NULL) ? " " : "*");
+                offset = dev->ktp + (index * B43_SEC_KEYSIZE);
+                for (i = 0; i < B43_SEC_KEYSIZE; i += 2) {
+                        u16 tmp = b43_shm_read16(dev, B43_SHM_SHARED, offset + i);
+                        printk("%02X%02X", (tmp & 0xFF), ((tmp >> 8) & 0xFF));
+                }
+
+                algo = b43_shm_read16(dev, B43_SHM_SHARED,
+                                      B43_SHM_SH_KEYIDXBLOCK + (index * 2));
+                printk("   Algo: %04X/%02X", algo, key->algorithm);
+
+                if (index >= 4) {
+                        rcmta0 = b43_shm_read32(dev, B43_SHM_RCMTA,
+                                                ((index - 4) * 2) + 0);
+                        rcmta1 = b43_shm_read16(dev, B43_SHM_RCMTA,
+                                                ((index - 4) * 2) + 1);
+                        *((__le32 *)(&mac[0])) = cpu_to_le32(rcmta0);
+                        *((__le16 *)(&mac[4])) = cpu_to_le16(rcmta1);
+                        printk("   MAC: %s",
+                               print_mac(macbuf, mac));
+                } else
+                        printk("   DEFAULT KEY");
+                printk("\n");
+        }
+}
+
 void b43_power_saving_ctl_bits(struct b43_wldev *dev, unsigned int ps_flags)
 {
         u32 macctl;
@@ -3324,7 +3370,6 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
         unsigned long flags;
         int antenna;
         int err = 0;
-        u32 savedirqs;
 
         mutex_lock(&wl->mutex);
 
@@ -3335,24 +3380,14 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
         dev = wl->current_dev;
         phy = &dev->phy;
 
+        b43_mac_suspend(dev);
+
         if (changed & IEEE80211_CONF_CHANGE_RETRY_LIMITS)
                 b43_set_retry_limits(dev, conf->short_frame_max_tx_count,
                                           conf->long_frame_max_tx_count);
         changed &= ~IEEE80211_CONF_CHANGE_RETRY_LIMITS;
         if (!changed)
-                goto out_unlock_mutex;
-
-        /* Disable IRQs while reconfiguring the device.
-         * This makes it possible to drop the spinlock throughout
-         * the reconfiguration process. */
-        spin_lock_irqsave(&wl->irq_lock, flags);
-        if (b43_status(dev) < B43_STAT_STARTED) {
-                spin_unlock_irqrestore(&wl->irq_lock, flags);
-                goto out_unlock_mutex;
-        }
-        savedirqs = b43_interrupt_disable(dev, B43_IRQ_ALL);
-        spin_unlock_irqrestore(&wl->irq_lock, flags);
-        b43_synchronize_irq(dev);
+                goto out_mac_enable;
 
         /* Switch to the requested channel.
          * The firmware takes care of races with the TX handler. */
@@ -3399,11 +3434,9 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
                 }
         }
 
-        spin_lock_irqsave(&wl->irq_lock, flags);
-        b43_interrupt_enable(dev, savedirqs);
-        mmiowb();
-        spin_unlock_irqrestore(&wl->irq_lock, flags);
-      out_unlock_mutex:
+out_mac_enable:
+        b43_mac_enable(dev);
+out_unlock_mutex:
         mutex_unlock(&wl->mutex);
 
         return err;
@@ -3461,27 +3494,12 @@ static void b43_op_bss_info_changed(struct ieee80211_hw *hw,
 {
         struct b43_wl *wl = hw_to_b43_wl(hw);
         struct b43_wldev *dev;
-        struct b43_phy *phy;
-        unsigned long flags;
-        u32 savedirqs;
 
         mutex_lock(&wl->mutex);
 
         dev = wl->current_dev;
-        phy = &dev->phy;
-
-        /* Disable IRQs while reconfiguring the device.
-         * This makes it possible to drop the spinlock throughout
-         * the reconfiguration process. */
-        spin_lock_irqsave(&wl->irq_lock, flags);
-        if (b43_status(dev) < B43_STAT_STARTED) {
-                spin_unlock_irqrestore(&wl->irq_lock, flags);
+        if (!dev || b43_status(dev) < B43_STAT_STARTED)
                 goto out_unlock_mutex;
-        }
-        savedirqs = b43_interrupt_disable(dev, B43_IRQ_ALL);
-        spin_unlock_irqrestore(&wl->irq_lock, flags);
-        b43_synchronize_irq(dev);
-
         b43_mac_suspend(dev);
 
         if (changed & BSS_CHANGED_BASIC_RATES)
@@ -3495,13 +3513,7 @@ static void b43_op_bss_info_changed(struct ieee80211_hw *hw,
         }
 
         b43_mac_enable(dev);
-
-        spin_lock_irqsave(&wl->irq_lock, flags);
-        b43_interrupt_enable(dev, savedirqs);
-        /* XXX: why? */
-        mmiowb();
-        spin_unlock_irqrestore(&wl->irq_lock, flags);
- out_unlock_mutex:
+out_unlock_mutex:
         mutex_unlock(&wl->mutex);
 
         return;
@@ -3599,15 +3611,18 @@ static int b43_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
         default:
                 B43_WARN_ON(1);
         }
+
 out_unlock:
-        spin_unlock_irqrestore(&wl->irq_lock, flags);
-        mutex_unlock(&wl->mutex);
         if (!err) {
                 b43dbg(wl, "%s hardware based encryption for keyidx: %d, "
                        "mac: %pM\n",
                        cmd == SET_KEY ? "Using" : "Disabling", key->keyidx,
                        addr);
+                b43_dump_keymemory(dev);
         }
+        spin_unlock_irqrestore(&wl->irq_lock, flags);
+        mutex_unlock(&wl->mutex);
+
         return err;
 }