rt2x00: trim skb_frame_desc to 32 bytes
Remove frame_type from skb_frame_desc and pass it as argument to rt2x00debug_dump_frame(). Change data_len and desc_len to unsigned short to save another 4 bytes in skb_frame_desc. Note that this was the only location where the data_len and desc_len was not yet treated as unsigned short. This trim is required to help mac80211 with adding the TX control and TX status informtation into the skb->cb structure. When that happens, drivers will have approximately 40 bytes left to use freely. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
5b06c85c3b
commit
5a6e59991b
|
@ -115,7 +115,7 @@ struct rt2x00debug_intf {
|
||||||
};
|
};
|
||||||
|
|
||||||
void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
|
void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
|
||||||
struct sk_buff *skb)
|
enum rt2x00_dump_type type, struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
struct rt2x00debug_intf *intf = rt2x00dev->debugfs_intf;
|
struct rt2x00debug_intf *intf = rt2x00dev->debugfs_intf;
|
||||||
struct skb_frame_desc *desc = get_skb_frame_desc(skb);
|
struct skb_frame_desc *desc = get_skb_frame_desc(skb);
|
||||||
|
@ -148,7 +148,7 @@ void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
|
||||||
dump_hdr->chip_rt = cpu_to_le16(rt2x00dev->chip.rt);
|
dump_hdr->chip_rt = cpu_to_le16(rt2x00dev->chip.rt);
|
||||||
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_le32(rt2x00dev->chip.rev);
|
dump_hdr->chip_rev = cpu_to_le32(rt2x00dev->chip.rev);
|
||||||
dump_hdr->type = cpu_to_le16(desc->frame_type);
|
dump_hdr->type = cpu_to_le16(type);
|
||||||
dump_hdr->queue_index = desc->entry->queue->qid;
|
dump_hdr->queue_index = desc->entry->queue->qid;
|
||||||
dump_hdr->entry_index = desc->entry->entry_idx;
|
dump_hdr->entry_index = desc->entry->entry_idx;
|
||||||
dump_hdr->timestamp_sec = cpu_to_le32(timestamp.tv_sec);
|
dump_hdr->timestamp_sec = cpu_to_le32(timestamp.tv_sec);
|
||||||
|
|
|
@ -28,7 +28,6 @@
|
||||||
|
|
||||||
#include "rt2x00.h"
|
#include "rt2x00.h"
|
||||||
#include "rt2x00lib.h"
|
#include "rt2x00lib.h"
|
||||||
#include "rt2x00dump.h"
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Link tuning handlers
|
* Link tuning handlers
|
||||||
|
@ -540,11 +539,9 @@ void rt2x00lib_txdone(struct queue_entry *entry,
|
||||||
* If send to mac80211, mac80211 will clean up the skb structure,
|
* If send to mac80211, mac80211 will clean up the skb structure,
|
||||||
* otherwise we have to do it ourself.
|
* otherwise we have to do it ourself.
|
||||||
*/
|
*/
|
||||||
|
rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_TXDONE, entry->skb);
|
||||||
|
|
||||||
skbdesc = get_skb_frame_desc(entry->skb);
|
skbdesc = get_skb_frame_desc(entry->skb);
|
||||||
skbdesc->frame_type = DUMP_FRAME_TXDONE;
|
|
||||||
|
|
||||||
rt2x00debug_dump_frame(rt2x00dev, entry->skb);
|
|
||||||
|
|
||||||
if (!(skbdesc->flags & FRAME_DESC_DRIVER_GENERATED))
|
if (!(skbdesc->flags & FRAME_DESC_DRIVER_GENERATED))
|
||||||
ieee80211_tx_status_irqsafe(rt2x00dev->hw,
|
ieee80211_tx_status_irqsafe(rt2x00dev->hw,
|
||||||
entry->skb, &tx_status);
|
entry->skb, &tx_status);
|
||||||
|
@ -610,8 +607,7 @@ void rt2x00lib_rxdone(struct queue_entry *entry,
|
||||||
* Send frame to mac80211 & debugfs.
|
* Send frame to mac80211 & debugfs.
|
||||||
* mac80211 will clean up the skb structure.
|
* mac80211 will clean up the skb structure.
|
||||||
*/
|
*/
|
||||||
get_skb_frame_desc(entry->skb)->frame_type = DUMP_FRAME_RXDONE;
|
rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_RXDONE, entry->skb);
|
||||||
rt2x00debug_dump_frame(rt2x00dev, entry->skb);
|
|
||||||
ieee80211_rx_irqsafe(rt2x00dev->hw, entry->skb, rx_status);
|
ieee80211_rx_irqsafe(rt2x00dev->hw, entry->skb, rx_status);
|
||||||
entry->skb = NULL;
|
entry->skb = NULL;
|
||||||
}
|
}
|
||||||
|
@ -752,8 +748,7 @@ void rt2x00lib_write_tx_desc(struct rt2x00_dev *rt2x00dev,
|
||||||
* frame to the device, but we are going to push the
|
* frame to the device, but we are going to push the
|
||||||
* frame to debugfs here.
|
* frame to debugfs here.
|
||||||
*/
|
*/
|
||||||
skbdesc->frame_type = DUMP_FRAME_TX;
|
rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_TX, skb);
|
||||||
rt2x00debug_dump_frame(rt2x00dev, skb);
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(rt2x00lib_write_tx_desc);
|
EXPORT_SYMBOL_GPL(rt2x00lib_write_tx_desc);
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,8 @@
|
||||||
#ifndef RT2X00LIB_H
|
#ifndef RT2X00LIB_H
|
||||||
#define RT2X00LIB_H
|
#define RT2X00LIB_H
|
||||||
|
|
||||||
|
#include "rt2x00dump.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Interval defines
|
* Interval defines
|
||||||
* Both the link tuner as the rfkill will be called once per second.
|
* Both the link tuner as the rfkill will be called once per second.
|
||||||
|
@ -128,7 +130,8 @@ 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, struct sk_buff *skb);
|
void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
|
||||||
|
enum rt2x00_dump_type type, struct sk_buff *skb);
|
||||||
#else
|
#else
|
||||||
static inline void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)
|
static inline void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)
|
||||||
{
|
{
|
||||||
|
@ -139,6 +142,7 @@ static inline void rt2x00debug_deregister(struct rt2x00_dev *rt2x00dev)
|
||||||
}
|
}
|
||||||
|
|
||||||
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,
|
||||||
struct sk_buff *skb)
|
struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
@ -109,7 +109,6 @@ enum skb_frame_desc_flags {
|
||||||
* this structure should not exceed the size of that array (48 bytes).
|
* this structure should not exceed the size of that array (48 bytes).
|
||||||
*
|
*
|
||||||
* @flags: Frame flags, see &enum skb_frame_desc_flags.
|
* @flags: Frame flags, see &enum skb_frame_desc_flags.
|
||||||
* @frame_type: Frame type, see &enum rt2x00_dump_type.
|
|
||||||
* @data: Pointer to data part of frame (Start of ieee80211 header).
|
* @data: Pointer to data part of frame (Start of ieee80211 header).
|
||||||
* @desc: Pointer to descriptor part of the frame.
|
* @desc: Pointer to descriptor part of the frame.
|
||||||
* Note that this pointer could point to something outside
|
* Note that this pointer could point to something outside
|
||||||
|
@ -121,14 +120,12 @@ enum skb_frame_desc_flags {
|
||||||
struct skb_frame_desc {
|
struct skb_frame_desc {
|
||||||
unsigned int flags;
|
unsigned int flags;
|
||||||
|
|
||||||
unsigned int frame_type;
|
unsigned short data_len;
|
||||||
|
unsigned short desc_len;
|
||||||
|
|
||||||
void *data;
|
void *data;
|
||||||
void *desc;
|
void *desc;
|
||||||
|
|
||||||
unsigned int data_len;
|
|
||||||
unsigned int desc_len;
|
|
||||||
|
|
||||||
struct queue_entry *entry;
|
struct queue_entry *entry;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue