aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-02-22 13:01:00 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-02-22 13:01:00 +0000
commitfc0a51c2e19e1cbb90acf81031eabf35d3484514 (patch)
tree53cc6b3dd89b5399831b90bd81a0bd02a83eacc4 /package/kernel
parentb44e9bff9dd2840df8353c8c4c71b26a14e5dd70 (diff)
downloadupstream-fc0a51c2e19e1cbb90acf81031eabf35d3484514.tar.gz
upstream-fc0a51c2e19e1cbb90acf81031eabf35d3484514.tar.bz2
upstream-fc0a51c2e19e1cbb90acf81031eabf35d3484514.zip
ath9k: enable u-apsd support
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 39685
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/mac80211/patches/300-pending_work.patch22
-rw-r--r--package/kernel/mac80211/patches/502-ath9k_ahb_init.patch2
-rw-r--r--package/kernel/mac80211/patches/530-ath9k_extra_leds.patch2
-rw-r--r--package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch4
-rw-r--r--package/kernel/mac80211/patches/552-ath9k_p2p_ps_support.patch2
5 files changed, 27 insertions, 5 deletions
diff --git a/package/kernel/mac80211/patches/300-pending_work.patch b/package/kernel/mac80211/patches/300-pending_work.patch
index be82f3704e..bedf8e715e 100644
--- a/package/kernel/mac80211/patches/300-pending_work.patch
+++ b/package/kernel/mac80211/patches/300-pending_work.patch
@@ -1,3 +1,15 @@
+commit 6514c93afede55284e2cb63359aadedb85884c80
+Author: Jouni Malinen <jouni@qca.qualcomm.com>
+Date: Tue Feb 18 20:41:08 2014 +0200
+
+ ath9k: Enable U-APSD AP mode support
+
+ mac80211 handles the actual operations, so ath9k can just indicate
+ support for this. Based on initial tests, this combination seems to
+ work fine.
+
+ Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
+
commit a63caf0a357ad5c1f08d6b7827dc76c451445017
Author: Stanislaw Gruszka <sgruszka@redhat.com>
Date: Wed Feb 19 13:15:17 2014 +0100
@@ -2794,3 +2806,13 @@ Date: Thu Jan 23 20:06:34 2014 +0100
buffered = ath_tid_has_buffered(tid);
tid->sched = false;
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -943,6 +943,7 @@ static void ath9k_set_hw_capab(struct at
+ hw->wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
+ hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_5_10_MHZ;
+ hw->wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;
++ hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD;
+
+ hw->queues = 4;
+ hw->max_rates = 4;
diff --git a/package/kernel/mac80211/patches/502-ath9k_ahb_init.patch b/package/kernel/mac80211/patches/502-ath9k_ahb_init.patch
index dd452dbd13..4edc63bede 100644
--- a/package/kernel/mac80211/patches/502-ath9k_ahb_init.patch
+++ b/package/kernel/mac80211/patches/502-ath9k_ahb_init.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -1111,23 +1111,23 @@ static int __init ath9k_init(void)
+@@ -1112,23 +1112,23 @@ static int __init ath9k_init(void)
goto err_out;
}
diff --git a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
index b8b6c007cd..5e0dffdc60 100644
--- a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
+++ b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
@@ -162,7 +162,7 @@
void ath_fill_led_pin(struct ath_softc *sc)
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -1017,7 +1017,7 @@ int ath9k_init_device(u16 devid, struct
+@@ -1018,7 +1018,7 @@ int ath9k_init_device(u16 devid, struct
#ifdef CPTCFG_MAC80211_LEDS
/* must be initialized before ieee80211_register_hw */
diff --git a/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch b/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch
index 6c18d0f2a0..12f8b7e765 100644
--- a/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch
+++ b/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch
@@ -65,7 +65,7 @@
}
void ath9k_reload_chainmask_settings(struct ath_softc *sc)
-@@ -979,6 +980,18 @@ static void ath9k_set_hw_capab(struct at
+@@ -980,6 +981,18 @@ static void ath9k_set_hw_capab(struct at
SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
}
@@ -84,7 +84,7 @@
int ath9k_init_device(u16 devid, struct ath_softc *sc,
const struct ath_bus_ops *bus_ops)
{
-@@ -1024,6 +1037,8 @@ int ath9k_init_device(u16 devid, struct
+@@ -1025,6 +1038,8 @@ int ath9k_init_device(u16 devid, struct
ARRAY_SIZE(ath9k_tpt_blink));
#endif
diff --git a/package/kernel/mac80211/patches/552-ath9k_p2p_ps_support.patch b/package/kernel/mac80211/patches/552-ath9k_p2p_ps_support.patch
index feec14a217..4a61db3f9a 100644
--- a/package/kernel/mac80211/patches/552-ath9k_p2p_ps_support.patch
+++ b/package/kernel/mac80211/patches/552-ath9k_p2p_ps_support.patch
@@ -223,7 +223,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
ath9k_cmn_init_crypto(sc->sc_ah);
ath9k_init_misc(sc);
ath_fill_led_pin(sc);
-@@ -1081,6 +1084,9 @@ static void ath9k_deinit_softc(struct at
+@@ -1082,6 +1085,9 @@ static void ath9k_deinit_softc(struct at
{
int i = 0;