Skip to content

Commit

Permalink
rt2x00: Dump beacons under a different identifier than TX frames.
Browse files Browse the repository at this point in the history
This allows for specific identification of beacons in the debugfs
frame stream.
Preparation for later differences between dumped TX frames and dumped
beacons.

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>
  • Loading branch information
Gertjan van Wingerde authored and John W. Linville committed May 12, 2010
1 parent 85b7a8b commit 185e5f7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
3 changes: 3 additions & 0 deletions drivers/net/wireless/rt2x00/rt2x00dump.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,14 @@
* the tx event which has either succeeded or failed. A frame
* with this type should also have been reported with as a
* %DUMP_FRAME_TX frame.
* @DUMP_FRAME_BEACON: This beacon frame is queued for transmission to the
* hardware.
*/
enum rt2x00_dump_type {
DUMP_FRAME_RXDONE = 1,
DUMP_FRAME_TX = 2,
DUMP_FRAME_TXDONE = 3,
DUMP_FRAME_BEACON = 4,
};

/**
Expand Down
5 changes: 4 additions & 1 deletion drivers/net/wireless/rt2x00/rt2x00queue.c
Original file line number Diff line number Diff line change
Expand Up @@ -420,14 +420,17 @@ static void rt2x00queue_write_tx_descriptor(struct queue_entry *entry,
{
struct data_queue *queue = entry->queue;
struct rt2x00_dev *rt2x00dev = queue->rt2x00dev;
enum rt2x00_dump_type dump_type;

rt2x00dev->ops->lib->write_tx_desc(rt2x00dev, entry->skb, txdesc);

/*
* All processing on the frame has been completed, this means
* it is now ready to be dumped to userspace through debugfs.
*/
rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_TX, entry->skb);
dump_type = (txdesc->queue == QID_BEACON) ?
DUMP_FRAME_BEACON : DUMP_FRAME_TX;
rt2x00debug_dump_frame(rt2x00dev, dump_type, entry->skb);
}

static void rt2x00queue_kick_tx_queue(struct queue_entry *entry,
Expand Down

0 comments on commit 185e5f7

Please sign in to comment.