microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

rt2x00: call entry directly in rt2x00_dump_frame 

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Stanislaw Gruszka 2017-02-08 13:51:30 +01:00 коммит произвёл Kalle Valo
Родитель 80a97eae30
Коммит 2ceb813798
10 изменённых файлов: 15 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
drivers/net/wireless/ralink/rt2x00/rt2400pci.c
Просмотреть файл

@ -1200,7 +1200,7 @@ static void rt2400pci_write_beacon(struct queue_entry *entry,
/* /*
* Dump beacon to userspace through debugfs. * Dump beacon to userspace through debugfs.
*/ */
rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb); rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry);
out: out:
/* /*
* Enable beaconing again. * Enable beaconing again.

2
drivers/net/wireless/ralink/rt2x00/rt2500pci.c
Просмотреть файл

@ -1349,7 +1349,7 @@ static void rt2500pci_write_beacon(struct queue_entry *entry,
/* /*
* Dump beacon to userspace through debugfs. * Dump beacon to userspace through debugfs.
*/ */
rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb); rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry);
out: out:
/* /*
* Enable beaconing again. * Enable beaconing again.

2
drivers/net/wireless/ralink/rt2x00/rt2500usb.c
Просмотреть файл

@ -1170,7 +1170,7 @@ static void rt2500usb_write_beacon(struct queue_entry *entry,
/* /*
* Dump beacon to userspace through debugfs. * 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 * USB devices cannot blindly pass the skb->len as the

2
drivers/net/wireless/ralink/rt2x00/rt2800lib.c
Просмотреть файл

@ -1014,7 +1014,7 @@ void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc)
/* /*
* Dump beacon to userspace through debugfs. * 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. * Write entire beacon with TXWI and padding to register.

4
drivers/net/wireless/ralink/rt2x00/rt2x00.h
Просмотреть файл

@ -1400,11 +1400,11 @@ void rt2x00queue_flush_queues(struct rt2x00_dev *rt2x00dev, bool drop);
*/ */
#ifdef CONFIG_RT2X00_LIB_DEBUGFS #ifdef CONFIG_RT2X00_LIB_DEBUGFS
void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev, 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 #else
static inline void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev, static inline void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
enum rt2x00_dump_type type, enum rt2x00_dump_type type,
struct sk_buff *skb) struct queue_entry *entry)
{ {
} }
#endif /* CONFIG_RT2X00_LIB_DEBUGFS */ #endif /* CONFIG_RT2X00_LIB_DEBUGFS */

7
drivers/net/wireless/ralink/rt2x00/rt2x00debug.c
Просмотреть файл

@ -157,9 +157,10 @@ void rt2x00debug_update_crypto(struct rt2x00_dev *rt2x00dev,
} }
void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev, 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 rt2x00debug_intf *intf = rt2x00dev->debugfs_intf;
struct sk_buff *skb = entry->skb;
struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb); struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);
struct sk_buff *skbcopy; struct sk_buff *skbcopy;
struct rt2x00dump_hdr *dump_hdr; struct rt2x00dump_hdr *dump_hdr;
@ -196,8 +197,8 @@ void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
dump_hdr->chip_rf = cpu_to_le16(rt2x00dev->chip.rf); dump_hdr->chip_rf = cpu_to_le16(rt2x00dev->chip.rf);
dump_hdr->chip_rev = cpu_to_le16(rt2x00dev->chip.rev); dump_hdr->chip_rev = cpu_to_le16(rt2x00dev->chip.rev);
dump_hdr->type = cpu_to_le16(type); dump_hdr->type = cpu_to_le16(type);
dump_hdr->queue_index = skbdesc->entry->queue->qid; dump_hdr->queue_index = entry->queue->qid;
dump_hdr->entry_index = skbdesc->entry->entry_idx; dump_hdr->entry_index = entry->entry_idx;
dump_hdr->timestamp_sec = cpu_to_le32(timestamp.tv_sec); dump_hdr->timestamp_sec = cpu_to_le32(timestamp.tv_sec);
dump_hdr->timestamp_usec = cpu_to_le32(timestamp.tv_usec); dump_hdr->timestamp_usec = cpu_to_le32(timestamp.tv_usec);

4
drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
Просмотреть файл

@ -363,7 +363,7 @@ void rt2x00lib_txdone(struct queue_entry *entry,
* Send frame to debugfs immediately, after this call is completed * Send frame to debugfs immediately, after this call is completed
* we are going to overwrite the skb->cb array. * 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 * Determine if the frame has been successfully transmitted and
@ -772,7 +772,7 @@ void rt2x00lib_rxdone(struct queue_entry *entry, gfp_t gfp)
*/ */
rt2x00link_update_stats(rt2x00dev, entry->skb, &rxdesc); rt2x00link_update_stats(rt2x00dev, entry->skb, &rxdesc);
rt2x00debug_update_crypto(rt2x00dev, &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 * Initialize RX status information, and send frame

2
drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
Просмотреть файл

@ -544,7 +544,7 @@ static void rt2x00queue_write_tx_descriptor(struct queue_entry *entry,
* All processing on the frame has been completed, this means * All processing on the frame has been completed, this means
* it is now ready to be dumped to userspace through debugfs. * 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, static void rt2x00queue_kick_tx_queue(struct data_queue *queue,

2
drivers/net/wireless/ralink/rt2x00/rt61pci.c
Просмотреть файл

@ -1988,7 +1988,7 @@ static void rt61pci_write_beacon(struct queue_entry *entry,
/* /*
* Dump beacon to userspace through debugfs. * 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. * Write entire beacon with descriptor and padding to register.

2
drivers/net/wireless/ralink/rt2x00/rt73usb.c
Просмотреть файл

@ -1557,7 +1557,7 @@ static void rt73usb_write_beacon(struct queue_entry *entry,
/* /*
* Dump beacon to userspace through debugfs. * 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. * Write entire beacon with descriptor and padding to register.