aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/020-05-rt2x00-call-entry-directly-in-rt2x00_dump_frame.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/kernel/mac80211/patches/020-05-rt2x00-call-entry-directly-in-rt2x00_dump_frame.patch')
-rw-r--r--package/kernel/mac80211/patches/020-05-rt2x00-call-entry-directly-in-rt2x00_dump_frame.patch158
1 files changed, 0 insertions, 158 deletions
diff --git a/package/kernel/mac80211/patches/020-05-rt2x00-call-entry-directly-in-rt2x00_dump_frame.patch b/package/kernel/mac80211/patches/020-05-rt2x00-call-entry-directly-in-rt2x00_dump_frame.patch
deleted file mode 100644
index 241c1127bc..0000000000
--- a/package/kernel/mac80211/patches/020-05-rt2x00-call-entry-directly-in-rt2x00_dump_frame.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From 2ceb813798e1fd33e71a574771828c0f298e077b Mon Sep 17 00:00:00 2001
-From: Stanislaw Gruszka <sgruszka@redhat.com>
-Date: Wed, 8 Feb 2017 13:51:30 +0100
-Subject: [PATCH 05/19] rt2x00: call entry directly in rt2x00_dump_frame
-
-Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
----
- drivers/net/wireless/ralink/rt2x00/rt2400pci.c | 2 +-
- drivers/net/wireless/ralink/rt2x00/rt2500pci.c | 2 +-
- drivers/net/wireless/ralink/rt2x00/rt2500usb.c | 2 +-
- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 2 +-
- drivers/net/wireless/ralink/rt2x00/rt2x00.h | 4 ++--
- drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 7 ++++---
- drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 4 ++--
- drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 2 +-
- drivers/net/wireless/ralink/rt2x00/rt61pci.c | 2 +-
- drivers/net/wireless/ralink/rt2x00/rt73usb.c | 2 +-
- 10 files changed, 15 insertions(+), 14 deletions(-)
-
---- a/drivers/net/wireless/ralink/rt2x00/rt2400pci.c
-+++ b/drivers/net/wireless/ralink/rt2x00/rt2400pci.c
-@@ -1200,7 +1200,7 @@ static void rt2400pci_write_beacon(struc
- /*
- * Dump beacon to userspace through debugfs.
- */
-- rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);
-+ rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry);
- out:
- /*
- * Enable beaconing again.
---- a/drivers/net/wireless/ralink/rt2x00/rt2500pci.c
-+++ b/drivers/net/wireless/ralink/rt2x00/rt2500pci.c
-@@ -1349,7 +1349,7 @@ static void rt2500pci_write_beacon(struc
- /*
- * Dump beacon to userspace through debugfs.
- */
-- rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);
-+ rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry);
- out:
- /*
- * Enable beaconing again.
---- a/drivers/net/wireless/ralink/rt2x00/rt2500usb.c
-+++ b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c
-@@ -1170,7 +1170,7 @@ static void rt2500usb_write_beacon(struc
- /*
- * Dump beacon to userspace through debugfs.
- */
-- rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);
-+ rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry);
-
- /*
- * USB devices cannot blindly pass the skb->len as the
---- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
-@@ -1014,7 +1014,7 @@ void rt2800_write_beacon(struct queue_en
- /*
- * Dump beacon to userspace through debugfs.
- */
-- rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);
-+ rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry);
-
- /*
- * Write entire beacon with TXWI and padding to register.
---- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
-@@ -1400,11 +1400,11 @@ void rt2x00queue_flush_queues(struct rt2
- */
- #ifdef CPTCFG_RT2X00_LIB_DEBUGFS
- void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
-- enum rt2x00_dump_type type, struct sk_buff *skb);
-+ enum rt2x00_dump_type type, struct queue_entry *entry);
- #else
- static inline void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
- enum rt2x00_dump_type type,
-- struct sk_buff *skb)
-+ struct queue_entry *entry)
- {
- }
- #endif /* CPTCFG_RT2X00_LIB_DEBUGFS */
---- a/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c
-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c
-@@ -157,9 +157,10 @@ void rt2x00debug_update_crypto(struct rt
- }
-
- void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
-- enum rt2x00_dump_type type, struct sk_buff *skb)
-+ enum rt2x00_dump_type type, struct queue_entry *entry)
- {
- struct rt2x00debug_intf *intf = rt2x00dev->debugfs_intf;
-+ struct sk_buff *skb = entry->skb;
- struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);
- struct sk_buff *skbcopy;
- struct rt2x00dump_hdr *dump_hdr;
-@@ -196,8 +197,8 @@ void rt2x00debug_dump_frame(struct rt2x0
- dump_hdr->chip_rf = cpu_to_le16(rt2x00dev->chip.rf);
- dump_hdr->chip_rev = cpu_to_le16(rt2x00dev->chip.rev);
- dump_hdr->type = cpu_to_le16(type);
-- dump_hdr->queue_index = skbdesc->entry->queue->qid;
-- dump_hdr->entry_index = skbdesc->entry->entry_idx;
-+ dump_hdr->queue_index = entry->queue->qid;
-+ dump_hdr->entry_index = entry->entry_idx;
- dump_hdr->timestamp_sec = cpu_to_le32(timestamp.tv_sec);
- dump_hdr->timestamp_usec = cpu_to_le32(timestamp.tv_usec);
-
---- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
-@@ -363,7 +363,7 @@ void rt2x00lib_txdone(struct queue_entry
- * Send frame to debugfs immediately, after this call is completed
- * we are going to overwrite the skb->cb array.
- */
-- rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_TXDONE, entry->skb);
-+ rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_TXDONE, entry);
-
- /*
- * Determine if the frame has been successfully transmitted and
-@@ -772,7 +772,7 @@ void rt2x00lib_rxdone(struct queue_entry
- */
- rt2x00link_update_stats(rt2x00dev, entry->skb, &rxdesc);
- rt2x00debug_update_crypto(rt2x00dev, &rxdesc);
-- rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_RXDONE, entry->skb);
-+ rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_RXDONE, entry);
-
- /*
- * Initialize RX status information, and send frame
---- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
-@@ -544,7 +544,7 @@ static void rt2x00queue_write_tx_descrip
- * All processing on the frame has been completed, this means
- * it is now ready to be dumped to userspace through debugfs.
- */
-- rt2x00debug_dump_frame(queue->rt2x00dev, DUMP_FRAME_TX, entry->skb);
-+ rt2x00debug_dump_frame(queue->rt2x00dev, DUMP_FRAME_TX, entry);
- }
-
- static void rt2x00queue_kick_tx_queue(struct data_queue *queue,
---- a/drivers/net/wireless/ralink/rt2x00/rt61pci.c
-+++ b/drivers/net/wireless/ralink/rt2x00/rt61pci.c
-@@ -1988,7 +1988,7 @@ static void rt61pci_write_beacon(struct
- /*
- * Dump beacon to userspace through debugfs.
- */
-- rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);
-+ rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry);
-
- /*
- * Write entire beacon with descriptor and padding to register.
---- a/drivers/net/wireless/ralink/rt2x00/rt73usb.c
-+++ b/drivers/net/wireless/ralink/rt2x00/rt73usb.c
-@@ -1557,7 +1557,7 @@ static void rt73usb_write_beacon(struct
- /*
- * Dump beacon to userspace through debugfs.
- */
-- rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);
-+ rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry);
-
- /*
- * Write entire beacon with descriptor and padding to register.