Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

diff --combined drivers/net/wireless/b43/main.c
index 4c41cfe,fcbf0e2..490fb45
--- 1/drivers/net/wireless/b43/main.c
--- 2/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@@ -628,10 -628,17 +628,17 @@@ static void b43_upload_card_macaddress(
  static void b43_set_slot_time(struct b43_wldev *dev, u16 slot_time)
  {
        /* slot_time is in usec. */
-       if (dev->phy.type != B43_PHYTYPE_G)
+       /* This test used to exit for all but a G PHY. */
+       if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ)
                return;
-       b43_write16(dev, 0x684, 510 + slot_time);
-       b43_shm_write16(dev, B43_SHM_SHARED, 0x0010, slot_time);
+       b43_write16(dev, B43_MMIO_IFSSLOT, 510 + slot_time);
+       /* Shared memory location 0x0010 is the slot time and should be
+        * set to slot_time; however, this register is initially 0 and changing
+        * the value adversely affects the transmit rate for BCM4311
+        * devices. Until this behavior is unterstood, delete this step
+        *
+        * b43_shm_write16(dev, B43_SHM_SHARED, 0x0010, slot_time);
+        */
  }
  
  static void b43_short_slot_timing_enable(struct b43_wldev *dev)
@@@ -2958,7 -2965,7 +2965,7 @@@ static void do_periodic_work(struct b43
  /* Periodic work locking policy:
   *    The whole periodic work handler is protected by
   *    wl->mutex. If another lock is needed somewhere in the
 - *    pwork callchain, it's aquired in-place, where it's needed.
 + *    pwork callchain, it's acquired in-place, where it's needed.
   */
  static void b43_periodic_work_handler(struct work_struct *work)
  {

diff --combined drivers/net/wireless/iwmc3200wifi/rx.c
index 6d6ed74,64d16fe..f727b4a
--- 1/drivers/net/wireless/iwmc3200wifi/rx.c
--- 2/drivers/net/wireless/iwmc3200wifi/rx.c
+++ b/drivers/net/wireless/iwmc3200wifi/rx.c
@@@ -794,7 -794,7 +794,7 @@@ static int iwm_mlme_update_bss_table(st
        }
  
        bss->bss = kzalloc(bss_len, GFP_KERNEL);
-       if (!bss) {
+       if (!bss->bss) {
                kfree(bss);
                IWM_ERR(iwm, "Couldn't allocate bss\n");
                return -ENOMEM;
@@@ -1578,7 -1578,7 +1578,7 @@@ static void iwm_rx_process_packet(struc
                kfree_skb(packet->skb);
                break;
        default:
 -              IWM_ERR(iwm, "Unknow ticket action: %d\n",
 +              IWM_ERR(iwm, "Unknown ticket action: %d\n",
                        le16_to_cpu(ticket_node->ticket->action));
                kfree_skb(packet->skb);
        }