summaryrefslogtreecommitdiff
path: root/package/mac80211/patches/310-ath9k_pending_work.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-12-30 15:48:39 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-12-30 15:48:39 +0000
commita718ebf1ed8956ec84ccd2d7f79653c0c0c74e5b (patch)
treeec7a13467171da80b064df0aaf1bc78ca0e576b5 /package/mac80211/patches/310-ath9k_pending_work.patch
parent32510b4494c93fec61e01a2ffda8976ef6770d0c (diff)
downloadmtk-20170518-a718ebf1ed8956ec84ccd2d7f79653c0c0c74e5b.zip
mtk-20170518-a718ebf1ed8956ec84ccd2d7f79653c0c0c74e5b.tar.gz
mtk-20170518-a718ebf1ed8956ec84ccd2d7f79653c0c0c74e5b.tar.bz2
ath9k: add more pending fixes from linux-wireless@
SVN-Revision: 24858
Diffstat (limited to 'package/mac80211/patches/310-ath9k_pending_work.patch')
-rw-r--r--package/mac80211/patches/310-ath9k_pending_work.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/package/mac80211/patches/310-ath9k_pending_work.patch b/package/mac80211/patches/310-ath9k_pending_work.patch
index 7278551..eee9238 100644
--- a/package/mac80211/patches/310-ath9k_pending_work.patch
+++ b/package/mac80211/patches/310-ath9k_pending_work.patch
@@ -232,3 +232,39 @@
spin_unlock_bh(&txq->axq_lock);
txok = !(txs.ts_status & ATH9K_TXERR_MASK);
+--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
++++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+@@ -714,8 +714,7 @@ static void ath9k_set_hw_capab(struct at
+ IEEE80211_HW_HAS_RATE_CONTROL |
+ IEEE80211_HW_RX_INCLUDES_FCS |
+ IEEE80211_HW_SUPPORTS_PS |
+- IEEE80211_HW_PS_NULLFUNC_STACK |
+- IEEE80211_HW_NEED_DTIM_PERIOD;
++ IEEE80211_HW_PS_NULLFUNC_STACK;
+
+ hw->wiphy->interface_modes =
+ BIT(NL80211_IFTYPE_STATION) |
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -646,8 +646,7 @@ void ath9k_set_hw_capab(struct ath_softc
+ IEEE80211_HW_SUPPORTS_PS |
+ IEEE80211_HW_PS_NULLFUNC_STACK |
+ IEEE80211_HW_SPECTRUM_MGMT |
+- IEEE80211_HW_REPORTS_TX_ACK_STATUS |
+- IEEE80211_HW_NEED_DTIM_PERIOD;
++ IEEE80211_HW_REPORTS_TX_ACK_STATUS;
+
+ if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT)
+ hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION;
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -285,7 +285,8 @@ int ath_set_channel(struct ath_softc *sc
+ ath9k_hw_set_interrupts(ah, ah->imask);
+
+ if (!(sc->sc_flags & (SC_OP_OFFCHANNEL))) {
+- ath_beacon_config(sc, NULL);
++ if (sc->sc_flags & SC_OP_BEACONS)
++ ath_beacon_config(sc, NULL);
+ ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
+ ath_start_ani(common);
+ }