From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 20 Sep 2011 18:11:55 +0000 (-0400)
Subject: Merge branch 'master' of git://git.infradead.org/users/linville/wireless
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4d8b61490c14a36efdee4a8bf523e26809df05ac;p=linux-beck.git

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
---

4d8b61490c14a36efdee4a8bf523e26809df05ac
diff --cc drivers/net/wireless/ath/ath9k/ar9003_phy.h
index f1be87454308,5c590429f120..6cea546a1507
--- a/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/iwlwifi/iwl-pci.c
index 23b5f78207ca,2fdbffa079c1..1d7bb7423f94
--- a/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 c8e56858fa10,222d410c586e..031a291a13dc
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.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];
  
+ 	txq->time_stamp = jiffies;
+ 
 -	iwlagn_unmap_tfd(priv, meta, &txq->tfds[index], DMA_BIDIRECTIONAL);
 +	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/rt2800usb.c
index 4b907a53f97c,dbf501ca317f..f1565792f270
--- a/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));
  	}
  }