aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-05-03 21:14:38 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-05-03 21:14:38 +0000
commit427ae707cdd38bc504fdadfc41e6f0cc254f8ab7 (patch)
tree7eec875fbedec40e0939ad11ec4d80e1089faf2b /package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch
parent8897093981ee0b898d3d7306c1c4611b779e88b3 (diff)
downloadupstream-427ae707cdd38bc504fdadfc41e6f0cc254f8ab7.tar.gz
upstream-427ae707cdd38bc504fdadfc41e6f0cc254f8ab7.tar.bz2
upstream-427ae707cdd38bc504fdadfc41e6f0cc254f8ab7.zip
ath9k: merge a few upstream fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 40687
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 513c48d799..439a574352 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 @@
}
static const struct ieee80211_iface_limit if_limits[] = {
-@@ -768,6 +769,18 @@ static void ath9k_set_hw_capab(struct at
+@@ -770,6 +771,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)
{
-@@ -816,6 +829,8 @@ int ath9k_init_device(u16 devid, struct
+@@ -818,6 +831,8 @@ int ath9k_init_device(u16 devid, struct
ARRAY_SIZE(ath9k_tpt_blink));
#endif