aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-10-21 16:30:01 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-10-21 16:30:01 +0000
commit6b9acc65ec938d7acd68198f6af085426c3bfff5 (patch)
tree97e1c27c3327f86b3d8625899a6ec0712c63121a /package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch
parentc0ed1033ba4ff79ecb5e892fcd288b2d53711c35 (diff)
downloadupstream-6b9acc65ec938d7acd68198f6af085426c3bfff5.tar.gz
upstream-6b9acc65ec938d7acd68198f6af085426c3bfff5.tar.bz2
upstream-6b9acc65ec938d7acd68198f6af085426c3bfff5.zip
ath9k: merge a fix for queue start/stop handling (fixes #18164, #18130)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43011 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch')
-rw-r--r--package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch b/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch
index 53d56a9c98..18cc86c2e8 100644
--- a/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch
+++ b/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch
@@ -65,7 +65,7 @@
}
static const struct ieee80211_iface_limit if_limits[] = {
-@@ -851,6 +852,18 @@ static void ath9k_set_hw_capab(struct at
+@@ -856,6 +857,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)
{
-@@ -899,6 +912,8 @@ int ath9k_init_device(u16 devid, struct
+@@ -904,6 +917,8 @@ int ath9k_init_device(u16 devid, struct
ARRAY_SIZE(ath9k_tpt_blink));
#endif