aboutsummaryrefslogtreecommitdiffstats
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
parent32510b4494c93fec61e01a2ffda8976ef6770d0c (diff)
downloadupstream-a718ebf1ed8956ec84ccd2d7f79653c0c0c74e5b.tar.gz
upstream-a718ebf1ed8956ec84ccd2d7f79653c0c0c74e5b.tar.bz2
upstream-a718ebf1ed8956ec84ccd2d7f79653c0c0c74e5b.zip
ath9k: add more pending fixes from linux-wireless@
SVN-Revision: 24858
-rw-r--r--package/mac80211/patches/310-ath9k_pending_work.patch36
-rw-r--r--package/mac80211/patches/510-ath9k_led_cleanup.patch4
-rw-r--r--package/mac80211/patches/531-ath9k_legacy_chainmask_fix.patch6
3 files changed, 41 insertions, 5 deletions
diff --git a/package/mac80211/patches/310-ath9k_pending_work.patch b/package/mac80211/patches/310-ath9k_pending_work.patch
index 7278551d18..eee9238b1e 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);
+ }
diff --git a/package/mac80211/patches/510-ath9k_led_cleanup.patch b/package/mac80211/patches/510-ath9k_led_cleanup.patch
index be26a883cf..626bc0c2d8 100644
--- a/package/mac80211/patches/510-ath9k_led_cleanup.patch
+++ b/package/mac80211/patches/510-ath9k_led_cleanup.patch
@@ -253,7 +253,7 @@
/* Rfkill */
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1295,9 +1295,6 @@ static void ath9k_stop(struct ieee80211_
+@@ -1296,9 +1296,6 @@ static void ath9k_stop(struct ieee80211_
aphy->state = ATH_WIPHY_INACTIVE;
@@ -287,7 +287,7 @@
static void ath9k_deinit_softc(struct ath_softc *sc);
/*
-@@ -746,6 +761,13 @@ int ath9k_init_device(u16 devid, struct
+@@ -745,6 +760,13 @@ int ath9k_init_device(u16 devid, struct
ath9k_init_txpower_limits(sc);
diff --git a/package/mac80211/patches/531-ath9k_legacy_chainmask_fix.patch b/package/mac80211/patches/531-ath9k_legacy_chainmask_fix.patch
index df7e5cbbf3..a2968b29ba 100644
--- a/package/mac80211/patches/531-ath9k_legacy_chainmask_fix.patch
+++ b/package/mac80211/patches/531-ath9k_legacy_chainmask_fix.patch
@@ -10,7 +10,7 @@
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -538,32 +538,6 @@ set_timer:
+@@ -539,32 +539,6 @@ set_timer:
}
}
@@ -43,7 +43,7 @@
static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta)
{
struct ath_node *an;
-@@ -1676,8 +1650,6 @@ static int ath9k_config(struct ieee80211
+@@ -1677,8 +1651,6 @@ static int ath9k_config(struct ieee80211
/* XXX: remove me eventualy */
ath9k_update_ichannel(sc, hw, &sc->sc_ah->channels[pos]);
@@ -52,7 +52,7 @@
/* update survey stats for the old channel before switching */
spin_lock_irqsave(&common->cc_lock, flags);
ath_update_survey_stats(sc);
-@@ -1909,10 +1881,6 @@ static void ath9k_bss_info_changed(struc
+@@ -1910,10 +1882,6 @@ static void ath9k_bss_info_changed(struc
/* Set aggregation protection mode parameters */
sc->config.ath_aggr_prot = 0;