Merge branch 'master' of git://git.infradead.org/users/linville/wireless

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c

diff --cc drivers/bcma/main.c
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/base.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/ar9002_calib.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/ar9003_phy.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/ar9003_phy.h
index f1be874,5c59042..6cea546
--- 1/drivers/net/wireless/ath/ath9k/ar9003_phy.h
--- 2/drivers/net/wireless/ath/ath9k/ar9003_phy.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
@@@ -883,38 -839,19 +883,38 @@@
   */
  #define AR_SM1_BASE   0xb200
  
 -#define AR_PHY_SWITCH_CHAIN_1    (AR_SM1_BASE + 0x84)
 -#define AR_PHY_FCAL_2_1          (AR_SM1_BASE + 0xd0)
 -#define AR_PHY_DFT_TONE_CTL_1    (AR_SM1_BASE + 0xd4)
 -#define AR_PHY_CL_TAB_1          (AR_SM1_BASE + 0x100)
 -#define AR_PHY_CHAN_INFO_GAIN_1  (AR_SM1_BASE + 0x180)
 -#define AR_PHY_TPC_4_B1          (AR_SM1_BASE + 0x204)
 -#define AR_PHY_TPC_5_B1          (AR_SM1_BASE + 0x208)
 -#define AR_PHY_TPC_6_B1          (AR_SM1_BASE + 0x20c)
 -#define AR_PHY_TPC_11_B1         (AR_SM1_BASE + 0x220)
 -#define AR_PHY_PDADC_TAB_1       (AR_SM1_BASE + 0x240)
 +#define AR_PHY_SWITCH_CHAIN_1   (AR_SM1_BASE + 0x84)
 +#define AR_PHY_FCAL_2_1         (AR_SM1_BASE + 0xd0)
 +#define AR_PHY_DFT_TONE_CTL_1   (AR_SM1_BASE + 0xd4)
 +#define AR_PHY_CL_TAB_1         (AR_SM1_BASE + 0x100)
 +#define AR_PHY_CHAN_INFO_GAIN_1 (AR_SM1_BASE + 0x180)
 +#define AR_PHY_TPC_4_B1         (AR_SM1_BASE + 0x204)
 +#define AR_PHY_TPC_5_B1         (AR_SM1_BASE + 0x208)
 +#define AR_PHY_TPC_6_B1         (AR_SM1_BASE + 0x20c)
 +#define AR_PHY_TPC_11_B1        (AR_SM1_BASE + 0x220)
 +#define AR_PHY_PDADC_TAB_1    (AR_SM1_BASE + (AR_SREV_AR9300(ah) ? \
 +                                      0x240 : 0x280))
 +#define AR_PHY_TPC_19_B1      (AR_SM1_BASE + 0x240)
 +#define AR_PHY_TPC_19_B1_ALPHA_THERM          0xff
 +#define AR_PHY_TPC_19_B1_ALPHA_THERM_S                0
  #define AR_PHY_TX_IQCAL_STATUS_B1   (AR_SM1_BASE + 0x48c)
- #define AR_PHY_TX_IQCAL_CORR_COEFF_B1(_i)    (AR_SM_BASE + 0x450 + ((_i) << 2))
+ #define AR_PHY_TX_IQCAL_CORR_COEFF_B1(_i)    (AR_SM1_BASE + 0x450 + ((_i) << 2))
  
 +/* SM 1 AIC Registers */
 +
 +#define AR_PHY_AIC_CTRL_0_B1  (AR_SM1_BASE + 0x4b0)
 +#define AR_PHY_AIC_CTRL_1_B1  (AR_SM1_BASE + 0x4b4)
 +#define AR_PHY_AIC_CTRL_2_B1  (AR_SM1_BASE + 0x4b8)
 +#define AR_PHY_AIC_STAT_0_B1  (AR_SM1_BASE + (AR_SREV_9480_10(ah) ? \
 +                                      0x4c0 : 0x4c4))
 +#define AR_PHY_AIC_STAT_1_B1  (AR_SM1_BASE + (AR_SREV_9480_10(ah) ? \
 +                                      0x4c4 : 0x4c8))
 +#define AR_PHY_AIC_CTRL_4_B1  (AR_SM1_BASE + 0x4c0)
 +#define AR_PHY_AIC_STAT_2_B1  (AR_SM1_BASE + 0x4cc)
 +
 +#define AR_PHY_AIC_SRAM_ADDR_B1       (AR_SM1_BASE + 0x5f0)
 +#define AR_PHY_AIC_SRAM_DATA_B1       (AR_SM1_BASE + 0x5f4)
 +
  /*
   * Channel 2 Register Map
   */

diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge

diff --cc drivers/net/wireless/ath/carl9170/main.c
Simple merge

diff --cc drivers/net/wireless/b43/dma.c
Simple merge

diff --cc drivers/net/wireless/b43/main.c
Simple merge

diff --cc drivers/net/wireless/ipw2x00/ipw2200.c
Simple merge

diff --cc drivers/net/wireless/iwlegacy/iwl-3945-rs.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-pci.c
index 23b5f78,2fdbffa..1d7bb74
--- 1/drivers/net/wireless/iwlwifi/iwl-pci.c
--- 2/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
@@@ -481,17 -480,18 +481,18 @@@ out_no_pci
  
  static void __devexit iwl_pci_remove(struct pci_dev *pdev)
  {
 -      struct iwl_priv *priv = pci_get_drvdata(pdev);
 -      struct iwl_bus *bus = priv->bus;
 +      struct iwl_bus *bus = pci_get_drvdata(pdev);
        struct iwl_pci_bus *pci_bus = IWL_BUS_GET_PCI_BUS(bus);
+       struct pci_dev *pci_dev = IWL_BUS_GET_PCI_DEV(bus);
 +      struct iwl_shared *shrd = bus->shrd;
  
 -      iwl_remove(priv);
 +      iwl_remove(shrd->priv);
  
-       pci_disable_msi(pci_bus->pci_dev);
-       pci_iounmap(pci_bus->pci_dev, pci_bus->hw_base);
-       pci_release_regions(pci_bus->pci_dev);
-       pci_disable_device(pci_bus->pci_dev);
-       pci_set_drvdata(pci_bus->pci_dev, NULL);
+       pci_disable_msi(pci_dev);
+       pci_iounmap(pci_dev, pci_bus->hw_base);
+       pci_release_regions(pci_dev);
+       pci_disable_device(pci_dev);
+       pci_set_drvdata(pci_dev, NULL);
  
        kfree(bus);
  }

diff --cc drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
index c8e5685,222d410..031a291
--- 1/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
--- 2/drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
@@@ -928,8 -771,9 +928,10 @@@ void iwl_tx_cmd_complete(struct iwl_tra
        cmd = txq->cmd[cmd_index];
        meta = &txq->meta[cmd_index];
  
 -      iwlagn_unmap_tfd(priv, meta, &txq->tfds[index], DMA_BIDIRECTIONAL);
+       txq->time_stamp = jiffies;
+ 
 +      iwlagn_unmap_tfd(trans, meta, &txq->tfds[index],
 +                       DMA_BIDIRECTIONAL);
  
        /* Input error checking is done when commands are added to queue. */
        if (meta->flags & CMD_WANT_SKB) {

diff --cc drivers/net/wireless/rt2x00/rt2800lib.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2800usb.c
index 4b907a5,dbf501c..f156579
--- 1/drivers/net/wireless/rt2x00/rt2800usb.c
--- 2/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@@ -529,13 -538,11 +538,12 @@@ static void rt2800usb_txdone(struct rt2
                        entry = rt2x00queue_get_entry(queue, Q_INDEX_DONE);
                        if (rt2800usb_txdone_entry_check(entry, reg))
                                break;
+                       entry = NULL;
                }
  
-               if (!entry || rt2x00queue_empty(queue))
-                       break;
- 
-               rt2800_txdone_entry(entry, reg,
-                                   rt2800usb_get_txwi(entry));
+               if (entry)
 -                      rt2800_txdone_entry(entry, reg);
++                      rt2800_txdone_entry(entry, reg,
++                                          rt2800usb_get_txwi(entry));
        }
  }
  

diff --cc drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
Simple merge

diff --cc drivers/net/wireless/wl12xx/acx.c
Simple merge

diff --cc drivers/net/wireless/wl12xx/sdio.c
Simple merge

diff --cc include/net/cfg80211.h
Simple merge

diff --cc net/mac80211/main.c
Simple merge

diff --cc net/mac80211/sta_info.c
Simple merge

diff --cc net/wireless/core.c
Simple merge

diff --cc net/wireless/reg.c
Simple merge