lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rt2x00: Move rt2x00debug_dump_frame declaration to rt2x00.h.

Browse Source 
This allows rt2x00debug_dump_frame to be used from everywhere.

This is preparation for beacon writing clean ups.

Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Gertjan van Wingerde
2010-05-13 13:16:36 +02:00
committed by John W. Linville
parent 19b87173be
commit b4df47081b
4 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/net/wireless/rt2x00/rt2x00.h
View File

@@ -39,6 +39,7 @@
#include <net/mac80211.h> #include <net/mac80211.h>
#include "rt2x00debug.h" #include "rt2x00debug.h"
#include "rt2x00dump.h"
#include "rt2x00leds.h" #include "rt2x00leds.h"
#include "rt2x00reg.h" #include "rt2x00reg.h"
#include "rt2x00queue.h" #include "rt2x00queue.h"
@@ -1014,6 +1015,26 @@ struct data_queue *rt2x00queue_get_queue(struct rt2x00_dev *rt2x00dev,
struct queue_entry *rt2x00queue_get_entry(struct data_queue *queue, struct queue_entry *rt2x00queue_get_entry(struct data_queue *queue,
enum queue_index index); enum queue_index index);
/*
* Debugfs handlers.
*/
/**
* 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.
*/
#ifdef CONFIG_RT2X00_LIB_DEBUGFS
void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
enum rt2x00_dump_type type, struct sk_buff *skb);
#else
static inline void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
enum rt2x00_dump_type type,
struct sk_buff *skb)
{
}
#endif /* CONFIG_RT2X00_LIB_DEBUGFS */
/* /*
* Interrupt context handlers. * Interrupt context handlers.
*/ */

1
drivers/net/wireless/rt2x00/rt2x00debug.c
View File

@@ -211,6 +211,7 @@ void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
if (!test_bit(FRAME_DUMP_FILE_OPEN, &intf->frame_dump_flags)) if (!test_bit(FRAME_DUMP_FILE_OPEN, &intf->frame_dump_flags))
skb_queue_purge(&intf->frame_dump_skbqueue); skb_queue_purge(&intf->frame_dump_skbqueue);
} }
EXPORT_SYMBOL_GPL(rt2x00debug_dump_frame);
static int rt2x00debug_file_open(struct inode *inode, struct file *file) static int rt2x00debug_file_open(struct inode *inode, struct file *file)
{ {

7
drivers/net/wireless/rt2x00/rt2x00dump.h
View File

@@ -20,7 +20,12 @@
/* /*
Module: rt2x00dump Module: rt2x00dump
Abstract: Data structures for the rt2x00debug & userspace. Abstract:
Data structures for the rt2x00debug & userspace.
The declarations in this file can be used by both rt2x00
and userspace and therefore should be kept together in
this file.
*/ */
#ifndef RT2X00DUMP_H #ifndef RT2X00DUMP_H

10
drivers/net/wireless/rt2x00/rt2x00lib.h
View File

@@ -27,8 +27,6 @@
#ifndef RT2X00LIB_H #ifndef RT2X00LIB_H
#define RT2X00LIB_H #define RT2X00LIB_H
#include "rt2x00dump.h"
/* /*
* Interval defines * Interval defines
*/ */
@@ -296,8 +294,6 @@ static inline void rt2x00lib_free_firmware(struct rt2x00_dev *rt2x00dev)
#ifdef CONFIG_RT2X00_LIB_DEBUGFS #ifdef CONFIG_RT2X00_LIB_DEBUGFS
void rt2x00debug_register(struct rt2x00_dev *rt2x00dev); void rt2x00debug_register(struct rt2x00_dev *rt2x00dev);
void rt2x00debug_deregister(struct rt2x00_dev *rt2x00dev); void rt2x00debug_deregister(struct rt2x00_dev *rt2x00dev);
void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
enum rt2x00_dump_type type, struct sk_buff *skb);
void rt2x00debug_update_crypto(struct rt2x00_dev *rt2x00dev, void rt2x00debug_update_crypto(struct rt2x00_dev *rt2x00dev,
struct rxdone_entry_desc *rxdesc); struct rxdone_entry_desc *rxdesc);
#else #else
@@ -309,12 +305,6 @@ static inline void rt2x00debug_deregister(struct rt2x00_dev *rt2x00dev)
{ {
} }
static inline void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
enum rt2x00_dump_type type,
struct sk_buff *skb)
{
}
static inline void rt2x00debug_update_crypto(struct rt2x00_dev *rt2x00dev, static inline void rt2x00debug_update_crypto(struct rt2x00_dev *rt2x00dev,
struct rxdone_entry_desc *rxdesc) struct rxdone_entry_desc *rxdesc)
{ {