aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2019-10-01 13:07:52 +0200
committerDaniel Golle <daniel@makrotopia.org>2019-10-01 15:54:53 +0200
commit0714a11bee24e5995da25ca9e0b2ae4b9f163408 (patch)
tree28b7b1a68a809a50568e79d5f0b2b7d059dc6af5
parent6077cde98aa5fbe7b4db96f5c5988b8dee75e4e4 (diff)
downloadupstream-0714a11bee24e5995da25ca9e0b2ae4b9f163408.tar.gz
upstream-0714a11bee24e5995da25ca9e0b2ae4b9f163408.tar.bz2
upstream-0714a11bee24e5995da25ca9e0b2ae4b9f163408.zip
mac80211: rt2x00: backport 'rt2x00: initialize last_reset'
https://patchwork.kernel.org/patch/11161981/ -- From: Stanislaw Gruszka <sgruszka@redhat.com> Subject: [PATCH] rt2x00: initialize last_reset Initialize last_reset variable to INITIAL_JIFFIES, otherwise it is not possible to test H/W reset for first 5 minutes of system run. Fixes: e403fa31ed71 ("rt2x00: add restart hw") Reported-and-tested-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> -- Signed-off-by: Daniel Golle <daniel@makrotopia.org>
-rw-r--r--package/kernel/mac80211/patches/rt2x00/017-rt2x00-initialize-last_reset.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/rt2x00/017-rt2x00-initialize-last_reset.patch b/package/kernel/mac80211/patches/rt2x00/017-rt2x00-initialize-last_reset.patch
new file mode 100644
index 0000000000..034bfdf757
--- /dev/null
+++ b/package/kernel/mac80211/patches/rt2x00/017-rt2x00-initialize-last_reset.patch
@@ -0,0 +1,35 @@
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: Stanislaw Gruszka <sgruszka@redhat.com>
+X-Patchwork-Id: 11161981
+From: Stanislaw Gruszka <sgruszka@redhat.com>
+To: linux-wireless@vger.kernel.org
+Subject: [PATCH] rt2x00: initialize last_reset
+Date: Thu, 26 Sep 2019 10:54:33 +0200
+Message-Id: <20190926085433.1300-1-sgruszka@redhat.com>
+Sender: linux-wireless-owner@vger.kernel.org
+List-ID: <linux-wireless.vger.kernel.org>
+X-Mailing-List: linux-wireless@vger.kernel.org
+
+Initialize last_reset variable to INITIAL_JIFFIES, otherwise it is not
+possible to test H/W reset for first 5 minutes of system run.
+
+Fixes: e403fa31ed71 ("rt2x00: add restart hw")
+Reported-and-tested-by: Jonathan Liu <net147@gmail.com>
+Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
+---
+ drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c
++++ b/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c
+@@ -575,7 +575,7 @@ static ssize_t rt2x00debug_write_restart
+ {
+ struct rt2x00debug_intf *intf = file->private_data;
+ struct rt2x00_dev *rt2x00dev = intf->rt2x00dev;
+- static unsigned long last_reset;
++ static unsigned long last_reset = INITIAL_JIFFIES;
+
+ if (!rt2x00_has_cap_restart_hw(rt2x00dev))
+ return -EOPNOTSUPP;