aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-11-14 12:21:19 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-11-14 12:21:19 +0000
commit6cf6b29d48fa9590dd1346b44ec411b66112f5a9 (patch)
treef9bf3b9432f816eaef3ee9b6446be2060c426305 /package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch
parent4a76eda9329b6b80cd5d7e8ebe434a94cab7221d (diff)
downloadupstream-6cf6b29d48fa9590dd1346b44ec411b66112f5a9.tar.gz
upstream-6cf6b29d48fa9590dd1346b44ec411b66112f5a9.tar.bz2
upstream-6cf6b29d48fa9590dd1346b44ec411b66112f5a9.zip
mac80211: merge a patch that enables DFS for ad-hoc mode
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38801 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch')
-rw-r--r--package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch4
1 files changed, 2 insertions, 2 deletions
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 d49dc65887..6303ce4cee 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)
-@@ -954,6 +955,18 @@ void ath9k_set_hw_capab(struct ath_softc
+@@ -955,6 +956,18 @@ void ath9k_set_hw_capab(struct ath_softc
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)
{
-@@ -999,6 +1012,8 @@ int ath9k_init_device(u16 devid, struct
+@@ -1000,6 +1013,8 @@ int ath9k_init_device(u16 devid, struct
ARRAY_SIZE(ath9k_tpt_blink));
#endif