From 83ef4a5fc6aa15e649ac8e18113ef2d41888039b Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 20 Apr 2011 18:14:35 +0000 Subject: mac80211: update to wireless-testing 2011-04-19, contains several beacon related fixes for ath9k git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26744 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/mac80211/patches/300-pending_work.patch | 353 ------------------------ 1 file changed, 353 deletions(-) delete mode 100644 package/mac80211/patches/300-pending_work.patch (limited to 'package/mac80211/patches/300-pending_work.patch') diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch deleted file mode 100644 index 982e233fb..000000000 --- a/package/mac80211/patches/300-pending_work.patch +++ /dev/null @@ -1,353 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/main.c -+++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -324,7 +324,6 @@ static void ath_paprd_activate(struct at - if (!caldata || !caldata->paprd_done) - return; - -- ath9k_ps_wakeup(sc); - ar9003_paprd_enable(ah, false); - for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) { - if (!(common->tx_chainmask & BIT(chain))) -@@ -334,7 +333,6 @@ static void ath_paprd_activate(struct at - } - - ar9003_paprd_enable(ah, true); -- ath9k_ps_restore(sc); - } - - static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int chain) -@@ -554,8 +552,11 @@ set_timer: - if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_PAPRD) && ah->caldata) { - if (!ah->caldata->paprd_done) - ieee80211_queue_work(sc->hw, &sc->paprd_work); -- else if (!ah->paprd_table_write_done) -+ else if (!ah->paprd_table_write_done) { -+ ath9k_ps_wakeup(sc); - ath_paprd_activate(sc); -+ ath9k_ps_restore(sc); -+ } - } - } - -@@ -1376,7 +1377,6 @@ static void ath9k_calculate_summary_stat - - ath9k_calculate_iter_data(hw, vif, &iter_data); - -- ath9k_ps_wakeup(sc); - /* Set BSSID mask. */ - memcpy(common->bssidmask, iter_data.mask, ETH_ALEN); - ath_hw_setbssidmask(common); -@@ -1411,7 +1411,6 @@ static void ath9k_calculate_summary_stat - } - - ath9k_hw_set_interrupts(ah, ah->imask); -- ath9k_ps_restore(sc); - - /* Set up ANI */ - if ((iter_data.naps + iter_data.nadhocs) > 0) { -@@ -1457,6 +1456,7 @@ static int ath9k_add_interface(struct ie - struct ath_vif *avp = (void *)vif->drv_priv; - int ret = 0; - -+ ath9k_ps_wakeup(sc); - mutex_lock(&sc->mutex); - - switch (vif->type) { -@@ -1503,6 +1503,7 @@ static int ath9k_add_interface(struct ie - ath9k_do_vif_add_setup(hw, vif); - out: - mutex_unlock(&sc->mutex); -+ ath9k_ps_restore(sc); - return ret; - } - -@@ -1517,6 +1518,7 @@ static int ath9k_change_interface(struct - - ath_dbg(common, ATH_DBG_CONFIG, "Change Interface\n"); - mutex_lock(&sc->mutex); -+ ath9k_ps_wakeup(sc); - - /* See if new interface type is valid. */ - if ((new_type == NL80211_IFTYPE_ADHOC) && -@@ -1546,6 +1548,7 @@ static int ath9k_change_interface(struct - - ath9k_do_vif_add_setup(hw, vif); - out: -+ ath9k_ps_restore(sc); - mutex_unlock(&sc->mutex); - return ret; - } -@@ -1558,6 +1561,7 @@ static void ath9k_remove_interface(struc - - ath_dbg(common, ATH_DBG_CONFIG, "Detach Interface\n"); - -+ ath9k_ps_wakeup(sc); - mutex_lock(&sc->mutex); - - sc->nvifs--; -@@ -1569,6 +1573,7 @@ static void ath9k_remove_interface(struc - ath9k_calculate_summary_state(hw, NULL); - - mutex_unlock(&sc->mutex); -+ ath9k_ps_restore(sc); - } - - static void ath9k_enable_ps(struct ath_softc *sc) -@@ -1809,6 +1814,7 @@ static int ath9k_conf_tx(struct ieee8021 - - txq = sc->tx.txq_map[queue]; - -+ ath9k_ps_wakeup(sc); - mutex_lock(&sc->mutex); - - memset(&qi, 0, sizeof(struct ath9k_tx_queue_info)); -@@ -1832,6 +1838,7 @@ static int ath9k_conf_tx(struct ieee8021 - ath_beaconq_config(sc); - - mutex_unlock(&sc->mutex); -+ ath9k_ps_restore(sc); - - return ret; - } -@@ -1908,6 +1915,7 @@ static void ath9k_bss_info_changed(struc - int slottime; - int error; - -+ ath9k_ps_wakeup(sc); - mutex_lock(&sc->mutex); - - if (changed & BSS_CHANGED_BSSID) { -@@ -2008,6 +2016,7 @@ static void ath9k_bss_info_changed(struc - } - - mutex_unlock(&sc->mutex); -+ ath9k_ps_restore(sc); - } - - static u64 ath9k_get_tsf(struct ieee80211_hw *hw) ---- a/drivers/net/wireless/ath/ath9k/beacon.c -+++ b/drivers/net/wireless/ath/ath9k/beacon.c -@@ -392,14 +392,6 @@ void ath_beacon_tasklet(unsigned long da - tsf += TU_TO_USEC(ah->config.sw_beacon_response_time); - tsftu = TSF_TO_TU((tsf * ATH_BCBUF) >>32, tsf * ATH_BCBUF); - slot = (tsftu % (intval * ATH_BCBUF)) / intval; -- /* -- * Reverse the slot order to get slot 0 on the TBTT offset that does -- * not require TSF adjustment and other slots adding -- * slot/ATH_BCBUF * beacon_int to timestamp. For example, with -- * ATH_BCBUF = 4, we process beacon slots as follows: 3 2 1 0 3 2 1 .. -- * and slot 0 is at correct offset to TBTT. -- */ -- slot = ATH_BCBUF - slot - 1; - vif = sc->beacon.bslot[slot]; - - ath_dbg(common, ATH_DBG_BEACON, -@@ -708,7 +700,7 @@ void ath_beacon_config(struct ath_softc - if (cur_conf->dtim_period == 0) - cur_conf->dtim_period = 1; - -- switch (iftype) { -+ switch (sc->sc_ah->opmode) { - case NL80211_IFTYPE_AP: - ath_beacon_config_ap(sc, cur_conf); - break; ---- a/net/mac80211/rx.c -+++ b/net/mac80211/rx.c -@@ -1585,7 +1585,7 @@ ieee80211_drop_unencrypted_mgmt(struct i - } - - static int --__ieee80211_data_to_8023(struct ieee80211_rx_data *rx) -+__ieee80211_data_to_8023(struct ieee80211_rx_data *rx, bool *port_control) - { - struct ieee80211_sub_if_data *sdata = rx->sdata; - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data; -@@ -1593,6 +1593,7 @@ __ieee80211_data_to_8023(struct ieee8021 - struct ethhdr *ehdr; - int ret; - -+ *port_control = false; - if (ieee80211_has_a4(hdr->frame_control) && - sdata->vif.type == NL80211_IFTYPE_AP_VLAN && !sdata->u.vlan.sta) - return -1; -@@ -1611,11 +1612,13 @@ __ieee80211_data_to_8023(struct ieee8021 - return -1; - - ret = ieee80211_data_to_8023(rx->skb, sdata->vif.addr, sdata->vif.type); -- if (ret < 0 || !check_port_control) -+ if (ret < 0) - return ret; - - ehdr = (struct ethhdr *) rx->skb->data; -- if (ehdr->h_proto != rx->sdata->control_port_protocol) -+ if (ehdr->h_proto == rx->sdata->control_port_protocol) -+ *port_control = true; -+ else if (check_port_control) - return -1; - - return 0; -@@ -1916,6 +1919,7 @@ ieee80211_rx_h_data(struct ieee80211_rx_ - struct net_device *dev = sdata->dev; - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data; - __le16 fc = hdr->frame_control; -+ bool port_control; - int err; - - if (unlikely(!ieee80211_is_data(hdr->frame_control))) -@@ -1932,13 +1936,21 @@ ieee80211_rx_h_data(struct ieee80211_rx_ - sdata->vif.type == NL80211_IFTYPE_AP) - return RX_DROP_MONITOR; - -- err = __ieee80211_data_to_8023(rx); -+ err = __ieee80211_data_to_8023(rx, &port_control); - if (unlikely(err)) - return RX_DROP_UNUSABLE; - - if (!ieee80211_frame_allowed(rx, fc)) - return RX_DROP_MONITOR; - -+ if (rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN && -+ unlikely(port_control) && sdata->bss) { -+ sdata = container_of(sdata->bss, struct ieee80211_sub_if_data, -+ u.ap); -+ dev = sdata->dev; -+ rx->sdata = sdata; -+ } -+ - rx->skb->dev = dev; - - dev->stats.rx_packets++; ---- a/drivers/net/wireless/ath/ath9k/recv.c -+++ b/drivers/net/wireless/ath/ath9k/recv.c -@@ -75,7 +75,6 @@ static void ath_rx_buf_link(struct ath_s - *sc->rx.rxlink = bf->bf_daddr; - - sc->rx.rxlink = &ds->ds_link; -- ath9k_hw_rxena(ah); - } - - static void ath_setdefantenna(struct ath_softc *sc, u32 antenna) -@@ -426,9 +425,7 @@ u32 ath_calcrxfilter(struct ath_softc *s - else - rfilt |= ATH9K_RX_FILTER_BEACON; - -- if ((AR_SREV_9280_20_OR_LATER(sc->sc_ah) || -- AR_SREV_9285_12_OR_LATER(sc->sc_ah)) && -- (sc->sc_ah->opmode == NL80211_IFTYPE_AP) && -+ if ((sc->sc_ah->opmode == NL80211_IFTYPE_AP) || - (sc->rx.rxfilter & FIF_PSPOLL)) - rfilt |= ATH9K_RX_FILTER_PSPOLL; - -@@ -486,12 +483,12 @@ start_recv: - bool ath_stoprecv(struct ath_softc *sc) - { - struct ath_hw *ah = sc->sc_ah; -- bool stopped; -+ bool stopped, reset = false; - - spin_lock_bh(&sc->rx.rxbuflock); - ath9k_hw_abortpcurecv(ah); - ath9k_hw_setrxfilter(ah, 0); -- stopped = ath9k_hw_stopdmarecv(ah); -+ stopped = ath9k_hw_stopdmarecv(ah, &reset); - - if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) - ath_edma_stop_recv(sc); -@@ -506,7 +503,7 @@ bool ath_stoprecv(struct ath_softc *sc) - "confusing the DMA engine when we start RX up\n"); - ATH_DBG_WARN_ON_ONCE(!stopped); - } -- return stopped; -+ return stopped && !reset; - } - - void ath_flushrecv(struct ath_softc *sc) -@@ -1767,6 +1764,7 @@ requeue: - } else { - list_move_tail(&bf->list, &sc->rx.rxbuf); - ath_rx_buf_link(sc, bf); -+ ath9k_hw_rxena(ah); - } - } while (1); - ---- a/drivers/net/wireless/ath/ath9k/hw.c -+++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -1249,15 +1249,6 @@ int ath9k_hw_reset(struct ath_hw *ah, st - ah->txchainmask = common->tx_chainmask; - ah->rxchainmask = common->rx_chainmask; - -- if ((common->bus_ops->ath_bus_type != ATH_USB) && !ah->chip_fullsleep) { -- ath9k_hw_abortpcurecv(ah); -- if (!ath9k_hw_stopdmarecv(ah)) { -- ath_dbg(common, ATH_DBG_XMIT, -- "Failed to stop receive dma\n"); -- bChannelChange = false; -- } -- } -- - if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE)) - return -EIO; - ---- a/drivers/net/wireless/ath/ath9k/mac.c -+++ b/drivers/net/wireless/ath/ath9k/mac.c -@@ -710,27 +710,46 @@ void ath9k_hw_abortpcurecv(struct ath_hw - } - EXPORT_SYMBOL(ath9k_hw_abortpcurecv); - --bool ath9k_hw_stopdmarecv(struct ath_hw *ah) -+bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset) - { - #define AH_RX_STOP_DMA_TIMEOUT 10000 /* usec */ - struct ath_common *common = ath9k_hw_common(ah); -+ u32 mac_status, last_mac_status = 0; - int i; - -+ /* Enable access to the DMA observation bus */ -+ REG_WRITE(ah, AR_MACMISC, -+ ((AR_MACMISC_DMA_OBS_LINE_8 << AR_MACMISC_DMA_OBS_S) | -+ (AR_MACMISC_MISC_OBS_BUS_1 << -+ AR_MACMISC_MISC_OBS_BUS_MSB_S))); -+ - REG_WRITE(ah, AR_CR, AR_CR_RXD); - - /* Wait for rx enable bit to go low */ - for (i = AH_RX_STOP_DMA_TIMEOUT / AH_TIME_QUANTUM; i != 0; i--) { - if ((REG_READ(ah, AR_CR) & AR_CR_RXE) == 0) - break; -+ -+ if (!AR_SREV_9300_20_OR_LATER(ah)) { -+ mac_status = REG_READ(ah, AR_DMADBG_7) & 0x7f0; -+ if (mac_status == 0x1c0 && mac_status == last_mac_status) { -+ *reset = true; -+ break; -+ } -+ -+ last_mac_status = mac_status; -+ } -+ - udelay(AH_TIME_QUANTUM); - } - - if (i == 0) { - ath_err(common, -- "DMA failed to stop in %d ms AR_CR=0x%08x AR_DIAG_SW=0x%08x\n", -+ "DMA failed to stop in %d ms AR_CR=0x%08x AR_DIAG_SW=0x%08x DMADBG_7=0x%08x\n", - AH_RX_STOP_DMA_TIMEOUT / 1000, - REG_READ(ah, AR_CR), -- REG_READ(ah, AR_DIAG_SW)); -+ REG_READ(ah, AR_DIAG_SW), -+ REG_READ(ah, AR_DMADBG_7)); - return false; - } else { - return true; ---- a/drivers/net/wireless/ath/ath9k/mac.h -+++ b/drivers/net/wireless/ath/ath9k/mac.h -@@ -695,7 +695,7 @@ bool ath9k_hw_setrxabort(struct ath_hw * - void ath9k_hw_putrxbuf(struct ath_hw *ah, u32 rxdp); - void ath9k_hw_startpcureceive(struct ath_hw *ah, bool is_scanning); - void ath9k_hw_abortpcurecv(struct ath_hw *ah); --bool ath9k_hw_stopdmarecv(struct ath_hw *ah); -+bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset); - int ath9k_hw_beaconq_setup(struct ath_hw *ah); - - /* Interrupt Handling */ -- cgit v1.2.3