5b91d2b52e
Some of our local patches have been accepted upstream. And there are some more relevant changes (mostly for rt2800usb). Import them and rebase our remaining local patches on top. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
From dd35cc0896faff5ed9d22eac9ea4a1920e2eec0c Mon Sep 17 00:00:00 2001
|
|
From: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
Date: Wed, 15 Feb 2017 10:25:13 +0100
|
|
Subject: [PATCH 17/19] rt2x00: fix rt2x00debug_dump_frame comment
|
|
|
|
Reported-by: Jeroen Roovers <jer@airfi.aero>
|
|
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
drivers/net/wireless/ralink/rt2x00/rt2x00.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00.h b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
|
|
index 91ba10fdf732..ce340bfd71a0 100644
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
|
|
@@ -1396,7 +1396,7 @@ void rt2x00queue_flush_queues(struct rt2x00_dev *rt2x00dev, bool drop);
|
|
* rt2x00debug_dump_frame - Dump a frame to userspace through debugfs.
|
|
* @rt2x00dev: Pointer to &struct rt2x00_dev.
|
|
* @type: The type of frame that is being dumped.
|
|
- * @skb: The skb containing the frame to be dumped.
|
|
+ * @entry: The queue entry containing the frame to be dumped.
|
|
*/
|
|
#ifdef CPTCFG_RT2X00_LIB_DEBUGFS
|
|
void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
|
|
--
|
|
2.12.1
|
|
|