Commit b4df4708 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Move rt2x00debug_dump_frame declaration to rt2x00.h. 



This allows rt2x00debug_dump_frame to be used from everywhere.

This is preparation for beacon writing clean ups.

Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 19b87173

drivers/net/wireless/rt2x00/rt2x00.h

+21 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <net/mac80211.h>



#include "rt2x00debug.h"

#include "rt2x00dump.h"

#include "rt2x00leds.h"

#include "rt2x00reg.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,

					  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.

 */

drivers/net/wireless/rt2x00/rt2x00debug.c

+1 −0
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev, 
	if (!test_bit(FRAME_DUMP_FILE_OPEN, &intf->frame_dump_flags))

		skb_queue_purge(&intf->frame_dump_skbqueue);

}

EXPORT_SYMBOL_GPL(rt2x00debug_dump_frame);



static int rt2x00debug_file_open(struct inode *inode, struct file *file)

{

drivers/net/wireless/rt2x00/rt2x00dump.h

+6 −1
Original line number Diff line number Diff line
@@ -20,7 +20,12 @@ 


/*

	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

drivers/net/wireless/rt2x00/rt2x00lib.h

+0 −10
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
#ifndef RT2X00LIB_H

#define RT2X00LIB_H



#include "rt2x00dump.h"



/*

 * Interval defines

 */
@@ -296,8 +294,6 @@ static inline void rt2x00lib_free_firmware(struct rt2x00_dev *rt2x00dev) 
#ifdef CONFIG_RT2X00_LIB_DEBUGFS

void rt2x00debug_register(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,

			       struct rxdone_entry_desc *rxdesc);

#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,

					     struct rxdone_entry_desc *rxdesc)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE