mac80211: fold the rtlwifi patch into 300-pending_work.patch (upstream patch)

[openwrt/svn-archive/archive.git] / package / kernel / mac80211 / patches / 512-ath9k_channelbw_debugfs.patch

diff --git a/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch b/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
index ef87a35922a3eaa04d14e5ba6fac60612b32c942..d6d1ae2e638c3578609fa1db91af9799cb5a07c9 100644 (file)
--- a/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
+++ b/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -696,6 +696,7 @@ struct ath_softc {
+@@ -701,6 +701,7 @@ struct ath_softc {
        struct ieee80211_hw *hw;
        struct device *dev;
  
@@ -8,7 +8,7 @@
        struct survey_info *cur_survey;
        struct survey_info survey[ATH9K_NUM_CHANNELS];
  
-@@ -899,6 +900,7 @@ struct fft_sample_ht20 {
+@@ -905,6 +906,7 @@ struct fft_sample_ht20 {
        u8 data[SPECTRAL_HT20_NUM_BINS];
  } __packed;
  
@@ -47,7 +47,7 @@
 +              return -EFAULT;
 +
 +      buf[len] = '\0';
-+      if (strict_strtoul(buf, 0, &chan_bw))
++      if (kstrtoul(buf, 0, &chan_bw))
 +              return -EINVAL;
 +
 +      sc->chan_bw = chan_bw;