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

Commit a4765fa7 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-2.6

parents 089282fb 9f2a0fac

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

+8 −9
Original line number Diff line number Diff line
@@ -139,12 +139,12 @@ int ath5k_hw_attach(struct ath5k_softc *sc) 
	/* Fill the ath5k_hw struct with the needed functions */

	ret = ath5k_hw_init_desc_functions(ah);

	if (ret)

		goto err_free;

		goto err;



	/* Bring device out of sleep and reset its units */

	ret = ath5k_hw_nic_wakeup(ah, 0, true);

	if (ret)

		goto err_free;

		goto err;



	/* Get MAC, PHY and RADIO revisions */

	ah->ah_mac_srev = srev;
@@ -234,7 +234,7 @@ int ath5k_hw_attach(struct ath5k_softc *sc) 
		} else {

			ATH5K_ERR(sc, "Couldn't identify radio revision.\n");

			ret = -ENODEV;

			goto err_free;

			goto err;

		}

	}
@@ -244,7 +244,7 @@ int ath5k_hw_attach(struct ath5k_softc *sc) 
	(srev < AR5K_SREV_AR2425)) {

		ATH5K_ERR(sc, "Device not yet supported.\n");

		ret = -ENODEV;

		goto err_free;

		goto err;

	}



	/*
@@ -252,7 +252,7 @@ int ath5k_hw_attach(struct ath5k_softc *sc) 
	 */

	ret = ath5k_hw_post(ah);

	if (ret)

		goto err_free;

		goto err;



	/* Enable pci core retry fix on Hainan (5213A) and later chips */

	if (srev >= AR5K_SREV_AR5213A)
@@ -265,7 +265,7 @@ int ath5k_hw_attach(struct ath5k_softc *sc) 
	ret = ath5k_eeprom_init(ah);

	if (ret) {

		ATH5K_ERR(sc, "unable to init EEPROM\n");

		goto err_free;

		goto err;

	}



	ee = &ah->ah_capabilities.cap_eeprom;
@@ -307,7 +307,7 @@ int ath5k_hw_attach(struct ath5k_softc *sc) 
	if (ret) {

		ATH5K_ERR(sc, "unable to get device capabilities: 0x%04x\n",

			sc->pdev->device);

		goto err_free;

		goto err;

	}



	/* Crypto settings */
@@ -341,8 +341,7 @@ int ath5k_hw_attach(struct ath5k_softc *sc) 
	ath5k_hw_set_ledstate(ah, AR5K_LED_INIT);



	return 0;

err_free:

	kfree(ah);

err:

	return ret;

}

drivers/net/wireless/ath/ath9k/ath9k.h

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ struct ath_rx { 
	u8 rxotherant;

	u32 *rxlink;

	unsigned int rxfilter;

	spinlock_t rxflushlock;

	spinlock_t pcu_lock;

	spinlock_t rxbuflock;

	struct list_head rxbuf;

	struct ath_descdma rxdma;

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

+8 −2
Original line number Diff line number Diff line
@@ -801,10 +801,16 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev) 
	}

	kfree(buf);



	if ((hif_dev->device_id == 0x7010) || (hif_dev->device_id == 0x7015))

	switch (hif_dev->device_id) {

	case 0x7010:

	case 0x7015:

	case 0x9018:

		firm_offset = AR7010_FIRMWARE_TEXT;

	else

		break;

	default:

		firm_offset = AR9271_FIRMWARE_TEXT;

		break;

	}



	/*

	 * Issue FW download complete command to firmware.

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

+29 −2
Original line number Diff line number Diff line
@@ -241,6 +241,9 @@ int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw, 
	 */

	ath9k_hw_set_interrupts(ah, 0);

	ath_drain_all_txq(sc, false);



	spin_lock_bh(&sc->rx.pcu_lock);



	stopped = ath_stoprecv(sc);



	/* XXX: do not flush receive queue here. We don't want
@@ -268,6 +271,7 @@ int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw, 
			  "reset status %d\n",

			  channel->center_freq, r);

		spin_unlock_bh(&sc->sc_resetlock);

		spin_unlock_bh(&sc->rx.pcu_lock);

		goto ps_restore;

	}

	spin_unlock_bh(&sc->sc_resetlock);
@@ -276,9 +280,12 @@ int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw, 
		ath_print(common, ATH_DBG_FATAL,

			  "Unable to restart recv logic\n");

		r = -EIO;

		spin_unlock_bh(&sc->rx.pcu_lock);

		goto ps_restore;

	}



	spin_unlock_bh(&sc->rx.pcu_lock);



	ath_update_txpow(sc);

	ath9k_hw_set_interrupts(ah, ah->imask);
@@ -613,7 +620,7 @@ void ath9k_tasklet(unsigned long data) 
		rxmask = (ATH9K_INT_RX | ATH9K_INT_RXEOL | ATH9K_INT_RXORN);



	if (status & rxmask) {

		spin_lock_bh(&sc->rx.rxflushlock);

		spin_lock_bh(&sc->rx.pcu_lock);



		/* Check for high priority Rx first */

		if ((ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) &&
@@ -621,7 +628,7 @@ void ath9k_tasklet(unsigned long data) 
			ath_rx_tasklet(sc, 0, true);



		ath_rx_tasklet(sc, 0, false);

		spin_unlock_bh(&sc->rx.rxflushlock);

		spin_unlock_bh(&sc->rx.pcu_lock);

	}



	if (status & ATH9K_INT_TX) {
@@ -876,6 +883,7 @@ void ath_radio_enable(struct ath_softc *sc, struct ieee80211_hw *hw) 
	if (!ah->curchan)

		ah->curchan = ath_get_curchannel(sc, sc->hw);



	spin_lock_bh(&sc->rx.pcu_lock);

	spin_lock_bh(&sc->sc_resetlock);

	r = ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);

	if (r) {
@@ -890,8 +898,10 @@ void ath_radio_enable(struct ath_softc *sc, struct ieee80211_hw *hw) 
	if (ath_startrecv(sc) != 0) {

		ath_print(common, ATH_DBG_FATAL,

			  "Unable to restart recv logic\n");

		spin_unlock_bh(&sc->rx.pcu_lock);

		return;

	}

	spin_unlock_bh(&sc->rx.pcu_lock);



	if (sc->sc_flags & SC_OP_BEACONS)

		ath_beacon_config(sc, NULL);	/* restart beacons */
@@ -930,6 +940,9 @@ void ath_radio_disable(struct ath_softc *sc, struct ieee80211_hw *hw) 
	ath9k_hw_set_interrupts(ah, 0);



	ath_drain_all_txq(sc, false);	/* clear pending tx frames */



	spin_lock_bh(&sc->rx.pcu_lock);



	ath_stoprecv(sc);		/* turn off frame recv */

	ath_flushrecv(sc);		/* flush recv queue */
@@ -947,6 +960,9 @@ void ath_radio_disable(struct ath_softc *sc, struct ieee80211_hw *hw) 
	spin_unlock_bh(&sc->sc_resetlock);



	ath9k_hw_phy_disable(ah);



	spin_unlock_bh(&sc->rx.pcu_lock);



	ath9k_hw_configpcipowersave(ah, 1, 1);

	ath9k_ps_restore(sc);

	ath9k_setpower(sc, ATH9K_PM_FULL_SLEEP);
@@ -966,6 +982,9 @@ int ath_reset(struct ath_softc *sc, bool retry_tx) 


	ath9k_hw_set_interrupts(ah, 0);

	ath_drain_all_txq(sc, retry_tx);



	spin_lock_bh(&sc->rx.pcu_lock);



	ath_stoprecv(sc);

	ath_flushrecv(sc);
@@ -980,6 +999,8 @@ int ath_reset(struct ath_softc *sc, bool retry_tx) 
		ath_print(common, ATH_DBG_FATAL,

			  "Unable to start recv logic\n");



	spin_unlock_bh(&sc->rx.pcu_lock);



	/*

	 * We may be doing a reset in response to a request

	 * that changes the channel so update any state that
@@ -1142,6 +1163,7 @@ static int ath9k_start(struct ieee80211_hw *hw) 
	 * be followed by initialization of the appropriate bits

	 * and then setup of the interrupt mask.

	 */

	spin_lock_bh(&sc->rx.pcu_lock);

	spin_lock_bh(&sc->sc_resetlock);

	r = ath9k_hw_reset(ah, init_channel, ah->caldata, false);

	if (r) {
@@ -1150,6 +1172,7 @@ static int ath9k_start(struct ieee80211_hw *hw) 
			  "(freq %u MHz)\n", r,

			  curchan->center_freq);

		spin_unlock_bh(&sc->sc_resetlock);

		spin_unlock_bh(&sc->rx.pcu_lock);

		goto mutex_unlock;

	}

	spin_unlock_bh(&sc->sc_resetlock);
@@ -1171,8 +1194,10 @@ static int ath9k_start(struct ieee80211_hw *hw) 
		ath_print(common, ATH_DBG_FATAL,

			  "Unable to start recv logic\n");

		r = -EIO;

		spin_unlock_bh(&sc->rx.pcu_lock);

		goto mutex_unlock;

	}

	spin_unlock_bh(&sc->rx.pcu_lock);



	/* Setup our intr mask. */

	ah->imask = ATH9K_INT_TX | ATH9K_INT_RXEOL |
@@ -1371,12 +1396,14 @@ static void ath9k_stop(struct ieee80211_hw *hw) 
	 * before setting the invalid flag. */

	ath9k_hw_set_interrupts(ah, 0);



	spin_lock_bh(&sc->rx.pcu_lock);

	if (!(sc->sc_flags & SC_OP_INVALID)) {

		ath_drain_all_txq(sc, false);

		ath_stoprecv(sc);

		ath9k_hw_phy_disable(ah);

	} else

		sc->rx.rxlink = NULL;

	spin_unlock_bh(&sc->rx.pcu_lock);



	/* disable HAL and put h/w to sleep */

	ath9k_hw_disable(ah);

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

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ static u8 ath_rc_setvalid_rates(struct ath_rate_priv *ath_rc_priv, 
	for (i = 0; i < rateset->rs_nrates; i++) {

		for (j = 0; j < rate_table->rate_cnt; j++) {

			u32 phy = rate_table->info[j].phy;

			u16 rate_flags = rate_table->info[i].rate_flags;

			u16 rate_flags = rate_table->info[j].rate_flags;

			u8 rate = rateset->rs_rates[i];

			u8 dot11rate = rate_table->info[j].dot11rate;