mac80211: update to wireless-testing 2010-11-10 + some pending work

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23968 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 0 insertions, 363 deletions

diff --git a/package/mac80211/patches/530-ath9k_locking_fix.patch b/package/mac80211/patches/530-ath9k_locking_fix.patch
deleted file mode 100644
index 354b720308..0000000000
--- a/package/mac80211/patches/530-ath9k_locking_fix.patch
+++ /dev/null
@@ -1,363 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/ath9k.h
-+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -309,7 +309,6 @@ struct ath_rx {
- 	u8 rxotherant;
- 	u32 *rxlink;
- 	unsigned int rxfilter;
--	spinlock_t rxflushlock;
- 	spinlock_t rxbuflock;
- 	struct list_head rxbuf;
- 	struct ath_descdma rxdma;
-@@ -599,9 +598,9 @@ struct ath_softc {
- 	struct ath_hw *sc_ah;
- 	void __iomem *mem;
- 	int irq;
--	spinlock_t sc_resetlock;
- 	spinlock_t sc_serial_rw;
- 	spinlock_t sc_pm_lock;
-+	spinlock_t sc_pcu_lock;
- 	struct mutex mutex;
- 	struct work_struct paprd_work;
- 	struct work_struct hw_check_work;
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -228,6 +228,8 @@ int ath_set_channel(struct ath_softc *sc
- 
- 	ath9k_ps_wakeup(sc);
- 
-+	spin_lock_bh(&sc->sc_pcu_lock);
-+
- 	/*
- 	 * This is only performed if the channel settings have
- 	 * actually changed.
-@@ -239,6 +241,7 @@ int ath_set_channel(struct ath_softc *sc
- 	 */
- 	ath9k_hw_disable_interrupts(ah);
- 	ath_drain_all_txq(sc, false);
-+
- 	stopped = ath_stoprecv(sc);
- 
- 	/* XXX: do not flush receive queue here. We don't want
-@@ -257,18 +260,14 @@ int ath_set_channel(struct ath_softc *sc
- 		  channel->center_freq, conf_is_ht40(conf),
- 		  fastcc);
- 
--	spin_lock_bh(&sc->sc_resetlock);
--
- 	r = ath9k_hw_reset(ah, hchan, caldata, fastcc);
- 	if (r) {
- 		ath_print(common, ATH_DBG_FATAL,
- 			  "Unable to reset channel (%u MHz), "
- 			  "reset status %d\n",
- 			  channel->center_freq, r);
--		spin_unlock_bh(&sc->sc_resetlock);
- 		goto ps_restore;
- 	}
--	spin_unlock_bh(&sc->sc_resetlock);
- 
- 	if (ath_startrecv(sc) != 0) {
- 		ath_print(common, ATH_DBG_FATAL,
-@@ -287,6 +286,8 @@ int ath_set_channel(struct ath_softc *sc
- 	}
- 
-  ps_restore:
-+	spin_unlock_bh(&sc->sc_pcu_lock);
-+
- 	ath9k_ps_restore(sc);
- 	return r;
- }
-@@ -600,6 +601,8 @@ void ath9k_tasklet(unsigned long data)
- 		return;
- 	}
- 
-+	spin_lock_bh(&sc->sc_pcu_lock);
-+
- 	if (!ath9k_hw_check_alive(ah))
- 		ieee80211_queue_work(sc->hw, &sc->hw_check_work);
- 
-@@ -610,15 +613,12 @@ 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);
--
- 		/* Check for high priority Rx first */
- 		if ((ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) &&
- 		    (status & ATH9K_INT_RXHP))
- 			ath_rx_tasklet(sc, 0, true);
- 
- 		ath_rx_tasklet(sc, 0, false);
--		spin_unlock_bh(&sc->rx.rxflushlock);
- 	}
- 
- 	if (status & ATH9K_INT_TX) {
-@@ -644,6 +644,8 @@ void ath9k_tasklet(unsigned long data)
- 
- 	/* re-enable hardware interrupt */
- 	ath9k_hw_enable_interrupts(ah);
-+
-+	spin_unlock_bh(&sc->sc_pcu_lock);
- 	ath9k_ps_restore(sc);
- }
- 
-@@ -871,12 +873,13 @@ void ath_radio_enable(struct ath_softc *
- 	int r;
- 
- 	ath9k_ps_wakeup(sc);
-+	spin_lock_bh(&sc->sc_pcu_lock);
-+
- 	ath9k_hw_configpcipowersave(ah, 0, 0);
- 
- 	if (!ah->curchan)
- 		ah->curchan = ath_get_curchannel(sc, sc->hw);
- 
--	spin_lock_bh(&sc->sc_resetlock);
- 	r = ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);
- 	if (r) {
- 		ath_print(common, ATH_DBG_FATAL,
-@@ -884,15 +887,14 @@ void ath_radio_enable(struct ath_softc *
- 			  "reset status %d\n",
- 			  channel->center_freq, r);
- 	}
--	spin_unlock_bh(&sc->sc_resetlock);
- 
- 	ath_update_txpow(sc);
- 	if (ath_startrecv(sc) != 0) {
- 		ath_print(common, ATH_DBG_FATAL,
- 			  "Unable to restart recv logic\n");
-+		spin_unlock_bh(&sc->sc_pcu_lock);
- 		return;
- 	}
--
- 	if (sc->sc_flags & SC_OP_BEACONS)
- 		ath_beacon_config(sc, NULL);	/* restart beacons */
- 
-@@ -905,6 +907,8 @@ void ath_radio_enable(struct ath_softc *
- 	ath9k_hw_set_gpio(ah, ah->led_pin, 0);
- 
- 	ieee80211_wake_queues(hw);
-+	spin_unlock_bh(&sc->sc_pcu_lock);
-+
- 	ath9k_ps_restore(sc);
- }
- 
-@@ -915,6 +919,8 @@ void ath_radio_disable(struct ath_softc 
- 	int r;
- 
- 	ath9k_ps_wakeup(sc);
-+	spin_lock_bh(&sc->sc_pcu_lock);
-+
- 	ieee80211_stop_queues(hw);
- 
- 	/*
-@@ -930,13 +936,13 @@ void ath_radio_disable(struct ath_softc 
- 	ath9k_hw_disable_interrupts(ah);
- 
- 	ath_drain_all_txq(sc, false);	/* clear pending tx frames */
-+
- 	ath_stoprecv(sc);		/* turn off frame recv */
- 	ath_flushrecv(sc);		/* flush recv queue */
- 
- 	if (!ah->curchan)
- 		ah->curchan = ath_get_curchannel(sc, hw);
- 
--	spin_lock_bh(&sc->sc_resetlock);
- 	r = ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);
- 	if (r) {
- 		ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_FATAL,
-@@ -944,11 +950,14 @@ void ath_radio_disable(struct ath_softc 
- 			  "reset status %d\n",
- 			  channel->center_freq, r);
- 	}
--	spin_unlock_bh(&sc->sc_resetlock);
- 
- 	ath9k_hw_phy_disable(ah);
-+
- 	ath9k_hw_configpcipowersave(ah, 1, 1);
-+
-+	spin_unlock_bh(&sc->sc_pcu_lock);
- 	ath9k_ps_restore(sc);
-+
- 	ath9k_setpower(sc, ATH9K_PM_FULL_SLEEP);
- }
- 
-@@ -962,19 +971,20 @@ int ath_reset(struct ath_softc *sc, bool
- 	/* Stop ANI */
- 	del_timer_sync(&common->ani.timer);
- 
-+	spin_lock_bh(&sc->sc_pcu_lock);
-+
- 	ieee80211_stop_queues(hw);
- 
- 	ath9k_hw_disable_interrupts(ah);
- 	ath_drain_all_txq(sc, retry_tx);
-+
- 	ath_stoprecv(sc);
- 	ath_flushrecv(sc);
- 
--	spin_lock_bh(&sc->sc_resetlock);
- 	r = ath9k_hw_reset(ah, sc->sc_ah->curchan, ah->caldata, false);
- 	if (r)
- 		ath_print(common, ATH_DBG_FATAL,
- 			  "Unable to reset hardware; reset status %d\n", r);
--	spin_unlock_bh(&sc->sc_resetlock);
- 
- 	if (ath_startrecv(sc) != 0)
- 		ath_print(common, ATH_DBG_FATAL,
-@@ -1004,6 +1014,7 @@ int ath_reset(struct ath_softc *sc, bool
- 	}
- 
- 	ieee80211_wake_queues(hw);
-+	spin_unlock_bh(&sc->sc_pcu_lock);
- 
- 	/* Start ANI */
- 	ath_start_ani(common);
-@@ -1142,17 +1153,16 @@ static int ath9k_start(struct ieee80211_
- 	 * be followed by initialization of the appropriate bits
- 	 * and then setup of the interrupt mask.
- 	 */
--	spin_lock_bh(&sc->sc_resetlock);
-+	spin_lock_bh(&sc->sc_pcu_lock);
- 	r = ath9k_hw_reset(ah, init_channel, ah->caldata, false);
- 	if (r) {
- 		ath_print(common, ATH_DBG_FATAL,
- 			  "Unable to reset hardware; reset status %d "
- 			  "(freq %u MHz)\n", r,
- 			  curchan->center_freq);
--		spin_unlock_bh(&sc->sc_resetlock);
-+		spin_unlock_bh(&sc->sc_pcu_lock);
- 		goto mutex_unlock;
- 	}
--	spin_unlock_bh(&sc->sc_resetlock);
- 
- 	/*
- 	 * This is needed only to setup initial state
-@@ -1171,8 +1181,10 @@ static int ath9k_start(struct ieee80211_
- 		ath_print(common, ATH_DBG_FATAL,
- 			  "Unable to start recv logic\n");
- 		r = -EIO;
-+		spin_unlock_bh(&sc->sc_pcu_lock);
- 		goto mutex_unlock;
- 	}
-+	spin_unlock_bh(&sc->sc_pcu_lock);
- 
- 	/* Setup our intr mask. */
- 	ah->imask = ATH9K_INT_TX | ATH9K_INT_RXEOL |
-@@ -1367,6 +1379,8 @@ static void ath9k_stop(struct ieee80211_
- 			ath9k_btcoex_timer_pause(sc);
- 	}
- 
-+	spin_lock_bh(&sc->sc_pcu_lock);
-+
- 	/* make sure h/w will not generate any interrupt
- 	 * before setting the invalid flag. */
- 	ath9k_hw_disable_interrupts(ah);
-@@ -1381,6 +1395,9 @@ static void ath9k_stop(struct ieee80211_
- 	/* disable HAL and put h/w to sleep */
- 	ath9k_hw_disable(ah);
- 	ath9k_hw_configpcipowersave(ah, 1, 1);
-+
-+	spin_unlock_bh(&sc->sc_pcu_lock);
-+
- 	ath9k_ps_restore(sc);
- 
- 	/* Finally, put the chip in FULL SLEEP mode */
---- a/drivers/net/wireless/ath/ath9k/recv.c
-+++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -297,19 +297,17 @@ static void ath_edma_start_recv(struct a
- 	ath_rx_addbuffer_edma(sc, ATH9K_RX_QUEUE_LP,
- 			      sc->rx.rx_edma[ATH9K_RX_QUEUE_LP].rx_fifo_hwsize);
- 
--	spin_unlock_bh(&sc->rx.rxbuflock);
--
- 	ath_opmode_init(sc);
- 
- 	ath9k_hw_startpcureceive(sc->sc_ah, (sc->sc_flags & SC_OP_OFFCHANNEL));
-+
-+	spin_unlock_bh(&sc->rx.rxbuflock);
- }
- 
- static void ath_edma_stop_recv(struct ath_softc *sc)
- {
--	spin_lock_bh(&sc->rx.rxbuflock);
- 	ath_rx_remove_buffer(sc, ATH9K_RX_QUEUE_HP);
- 	ath_rx_remove_buffer(sc, ATH9K_RX_QUEUE_LP);
--	spin_unlock_bh(&sc->rx.rxbuflock);
- }
- 
- int ath_rx_init(struct ath_softc *sc, int nbufs)
-@@ -319,7 +317,7 @@ int ath_rx_init(struct ath_softc *sc, in
- 	struct ath_buf *bf;
- 	int error = 0;
- 
--	spin_lock_init(&sc->rx.rxflushlock);
-+	spin_lock_init(&sc->sc_pcu_lock);
- 	sc->sc_flags &= ~SC_OP_RXFLUSH;
- 	spin_lock_init(&sc->rx.rxbuflock);
- 
-@@ -506,9 +504,9 @@ int ath_startrecv(struct ath_softc *sc)
- 	ath9k_hw_rxena(ah);
- 
- start_recv:
--	spin_unlock_bh(&sc->rx.rxbuflock);
- 	ath_opmode_init(sc);
- 	ath9k_hw_startpcureceive(ah, (sc->sc_flags & SC_OP_OFFCHANNEL));
-+	spin_unlock_bh(&sc->rx.rxbuflock);
- 
- 	return 0;
- }
-@@ -518,6 +516,7 @@ bool ath_stoprecv(struct ath_softc *sc)
- 	struct ath_hw *ah = sc->sc_ah;
- 	bool stopped;
- 
-+	spin_lock_bh(&sc->rx.rxbuflock);
- 	ath9k_hw_stoppcurecv(ah);
- 	ath9k_hw_setrxfilter(ah, 0);
- 	stopped = ath9k_hw_stopdmarecv(ah);
-@@ -526,19 +525,18 @@ bool ath_stoprecv(struct ath_softc *sc)
- 		ath_edma_stop_recv(sc);
- 	else
- 		sc->rx.rxlink = NULL;
-+	spin_unlock_bh(&sc->rx.rxbuflock);
- 
- 	return stopped;
- }
- 
- void ath_flushrecv(struct ath_softc *sc)
- {
--	spin_lock_bh(&sc->rx.rxflushlock);
- 	sc->sc_flags |= SC_OP_RXFLUSH;
- 	if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
- 		ath_rx_tasklet(sc, 1, true);
- 	ath_rx_tasklet(sc, 1, false);
- 	sc->sc_flags &= ~SC_OP_RXFLUSH;
--	spin_unlock_bh(&sc->rx.rxflushlock);
- }
- 
- static bool ath_beacon_dtim_pending_cab(struct sk_buff *skb)
---- a/drivers/net/wireless/ath/ath9k/init.c
-+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -592,7 +592,6 @@ static int ath9k_init_softc(u16 devid, s
- 	spin_lock_init(&common->cc_lock);
- 
- 	spin_lock_init(&sc->wiphy_lock);
--	spin_lock_init(&sc->sc_resetlock);
- 	spin_lock_init(&sc->sc_serial_rw);
- 	spin_lock_init(&sc->sc_pm_lock);
- 	mutex_init(&sc->mutex);
---- a/drivers/net/wireless/ath/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -1142,13 +1142,11 @@ void ath_drain_all_txq(struct ath_softc 
- 		ath_print(common, ATH_DBG_FATAL,
- 			  "Failed to stop TX DMA. Resetting hardware!\n");
- 
--		spin_lock_bh(&sc->sc_resetlock);
- 		r = ath9k_hw_reset(ah, sc->sc_ah->curchan, ah->caldata, false);
- 		if (r)
- 			ath_print(common, ATH_DBG_FATAL,
- 				  "Unable to reset hardware; reset status %d\n",
- 				  r);
--		spin_unlock_bh(&sc->sc_resetlock);
- 	}
- 
- 	for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {