Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3da63f3 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

parents 73e42897 a97f4424

Documentation/rfkill.txt

+2 −0
Original line number Diff line number Diff line
@@ -111,6 +111,8 @@ following attributes: 


	name: Name assigned by driver to this key (interface or driver name).

	type: Driver type string ("wlan", "bluetooth", etc).

	persistent: Whether the soft blocked state is initialised from

	            non-volatile storage at startup.

	state: Current state of the transmitter

		0: RFKILL_STATE_SOFT_BLOCKED

			transmitter is turned off by software

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -940,7 +940,7 @@ M: me@bobcopeland.com 
L:	linux-wireless@vger.kernel.org

L:	ath5k-devel@lists.ath5k.org

S:	Maintained

F:	drivers/net/wireless/ath5k/

F:	drivers/net/wireless/ath/ath5k/



ATHEROS ATH9K WIRELESS DRIVER

P:	Luis R. Rodriguez
@@ -956,7 +956,7 @@ M: senthilkumar@atheros.com 
L:	linux-wireless@vger.kernel.org

L:	ath9k-devel@lists.ath9k.org

S:	Supported

F:	drivers/net/wireless/ath9k/

F:	drivers/net/wireless/ath/ath9k/



ATHEROS AR9170 WIRELESS DRIVER

P:	Christian Lamparter
@@ -964,7 +964,7 @@ M: chunkeey@web.de 
L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/en/users/Drivers/ar9170

S:	Maintained

F:	drivers/net/wireless/ar9170/

F:	drivers/net/wireless/ath/ar9170/



ATI_REMOTE2 DRIVER

P:	Ville Syrjala

drivers/net/wireless/ath/ath5k/base.c

+8 −3
Original line number Diff line number Diff line
@@ -538,6 +538,7 @@ ath5k_pci_probe(struct pci_dev *pdev, 
	sc->iobase = mem; /* So we can unmap it on detach */

	sc->cachelsz = csz * sizeof(u32); /* convert to bytes */

	sc->opmode = NL80211_IFTYPE_STATION;

	sc->bintval = 1000;

	mutex_init(&sc->lock);

	spin_lock_init(&sc->rxbuflock);

	spin_lock_init(&sc->txbuflock);
@@ -686,6 +687,13 @@ ath5k_pci_resume(struct pci_dev *pdev) 
	if (err)

		return err;



	/*

	 * Suspend/Resume resets the PCI configuration space, so we have to

	 * re-disable the RETRY_TIMEOUT register (0x41) to keep

	 * PCI Tx retries from interfering with C3 CPU state

	 */

	pci_write_config_byte(pdev, 0x41, 0);



	err = request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, "ath", sc);

	if (err) {

		ATH5K_ERR(sc, "request_irq failed\n");
@@ -2748,9 +2756,6 @@ static int ath5k_add_interface(struct ieee80211_hw *hw, 
		goto end;

	}



	/* Set to a reasonable value. Note that this will

	 * be set to mac80211's value at ath5k_config(). */

	sc->bintval = 1000;

	ath5k_hw_set_lladdr(sc->ah, conf->mac_addr);



	ret = 0;

drivers/net/wireless/ath/ath9k/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1196,8 +1196,8 @@ void ath_radio_disable(struct ath_softc *sc) 


	ath9k_hw_phy_disable(ah);

	ath9k_hw_configpcipowersave(ah, 1);

	ath9k_hw_setpower(ah, ATH9K_PM_FULL_SLEEP);

	ath9k_ps_restore(sc);

	ath9k_hw_setpower(ah, ATH9K_PM_FULL_SLEEP);

}



/*******************/

drivers/net/wireless/ath/ath9k/pci.c

+18 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	struct ath_softc *sc;

	struct ieee80211_hw *hw;

	u8 csz;

	u32 val;

	int ret = 0;

	struct ath_hw *ah;
@@ -133,6 +134,14 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


	pci_set_master(pdev);



	/*

	 * Disable the RETRY_TIMEOUT register (0x41) to keep

	 * PCI Tx retries from interfering with C3 CPU state.

	 */

	pci_read_config_dword(pdev, 0x40, &val);

	if ((val & 0x0000ff00) != 0)

		pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);



	ret = pci_request_region(pdev, 0, "ath9k");

	if (ret) {

		dev_err(&pdev->dev, "PCI memory region reserve error\n");
@@ -239,12 +248,21 @@ static int ath_pci_resume(struct pci_dev *pdev) 
	struct ieee80211_hw *hw = pci_get_drvdata(pdev);

	struct ath_wiphy *aphy = hw->priv;

	struct ath_softc *sc = aphy->sc;

	u32 val;

	int err;



	err = pci_enable_device(pdev);

	if (err)

		return err;

	pci_restore_state(pdev);

	/*

	 * Suspend/Resume resets the PCI configuration space, so we have to

	 * re-disable the RETRY_TIMEOUT register (0x41) to keep

	 * PCI Tx retries from interfering with C3 CPU state

	 */

	pci_read_config_dword(pdev, 0x40, &val);

	if ((val & 0x0000ff00) != 0)

		pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);



	/* Enable LED */

	ath9k_hw_cfg_output(sc->sc_ah, ATH_LED_PIN,