diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-08-06 16:45:22 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-08-06 16:45:22 +0000 |
| commit | 6f4fc9c795a4e9ae61c49734022880c3284f8ca1 (patch) | |
| tree | 0fc0661755a6ba6ac200529bdc80d45253fa7b35 /package/mac80211/patches/553-ath9k_debugfs_diag.patch | |
| parent | 5a64212900a1420692412c752c6497b53daa0366 (diff) | |
| download | upstream-6f4fc9c795a4e9ae61c49734022880c3284f8ca1.tar.gz upstream-6f4fc9c795a4e9ae61c49734022880c3284f8ca1.tar.bz2 upstream-6f4fc9c795a4e9ae61c49734022880c3284f8ca1.zip | |
mac80211: backport a few upstream fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r37653
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@37728 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/553-ath9k_debugfs_diag.patch')
| -rw-r--r-- | package/mac80211/patches/553-ath9k_debugfs_diag.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/mac80211/patches/553-ath9k_debugfs_diag.patch b/package/mac80211/patches/553-ath9k_debugfs_diag.patch index db380b0814..06b1e1013c 100644 --- a/package/mac80211/patches/553-ath9k_debugfs_diag.patch +++ b/package/mac80211/patches/553-ath9k_debugfs_diag.patch @@ -30,7 +30,7 @@ + return -EFAULT; + + buf[len] = '\0'; -+ if (strict_strtoul(buf, 0, &diag)) ++ if (kstrtoul(buf, 0, &diag)) + return -EINVAL; + + ah->diag = diag; @@ -62,7 +62,7 @@ debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy, sc, --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h -@@ -499,6 +499,12 @@ enum { +@@ -500,6 +500,12 @@ enum { ATH9K_RESET_COLD, }; @@ -75,7 +75,7 @@ struct ath9k_hw_version { u32 magic; u16 devid; -@@ -777,6 +783,8 @@ struct ath_hw { +@@ -778,6 +784,8 @@ struct ath_hw { u32 rfkill_polarity; u32 ah_flags; @@ -84,7 +84,7 @@ bool reset_power_on; bool htc_reset_init; -@@ -1027,6 +1035,7 @@ void ath9k_hw_set_sta_beacon_timers(stru +@@ -1028,6 +1036,7 @@ void ath9k_hw_set_sta_beacon_timers(stru bool ath9k_hw_check_alive(struct ath_hw *ah); bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode); @@ -94,7 +94,7 @@ void ath9k_debug_sync_cause(struct ath_common *common, u32 sync_cause); --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -1853,6 +1853,20 @@ fail: +@@ -1854,6 +1854,20 @@ fail: return -EINVAL; } @@ -115,7 +115,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, struct ath9k_hw_cal_data *caldata, bool fastcc) { -@@ -2055,6 +2069,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st +@@ -2056,6 +2070,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st } ath9k_hw_apply_gpio_override(ah); |