summaryrefslogtreecommitdiffstats
path: root/net/mac80211/driver-trace.h
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-09-25 19:06:54 +0200
committerJohn W. Linville <linville@tuxdriver.com>2011-09-27 20:34:11 +0200
commitf6f3def323e5d60cc2a5659533dce547c0aac5fc (patch)
tree9e5470eb3301c588f3ec75cc3f0ce504b50d77d5 /net/mac80211/driver-trace.h
parentcfg80211/mac80211: add netdev param to set_txq_params() (diff)
downloadlinux-f6f3def323e5d60cc2a5659533dce547c0aac5fc.tar.xz
linux-f6f3def323e5d60cc2a5659533dce547c0aac5fc.zip
mac80211: save tx params per sdata
save and configure tx param per sdata, rather than per hardware. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/driver-trace.h')
-rw-r--r--net/mac80211/driver-trace.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/net/mac80211/driver-trace.h b/net/mac80211/driver-trace.h
index 07d94ff55798..a46b279bbbe4 100644
--- a/net/mac80211/driver-trace.h
+++ b/net/mac80211/driver-trace.h
@@ -697,32 +697,38 @@ TRACE_EVENT(drv_sta_remove,
);
TRACE_EVENT(drv_conf_tx,
- TP_PROTO(struct ieee80211_local *local, u16 queue,
+ TP_PROTO(struct ieee80211_local *local,
+ struct ieee80211_sub_if_data *sdata,
+ u16 queue,
const struct ieee80211_tx_queue_params *params),
- TP_ARGS(local, queue, params),
+ TP_ARGS(local, sdata, queue, params),
TP_STRUCT__entry(
LOCAL_ENTRY
+ VIF_ENTRY
__field(u16, queue)
__field(u16, txop)
__field(u16, cw_min)
__field(u16, cw_max)
__field(u8, aifs)
+ __field(bool, uapsd)
),
TP_fast_assign(
LOCAL_ASSIGN;
+ VIF_ASSIGN;
__entry->queue = queue;
__entry->txop = params->txop;
__entry->cw_max = params->cw_max;
__entry->cw_min = params->cw_min;
__entry->aifs = params->aifs;
+ __entry->uapsd = params->uapsd;
),
TP_printk(
- LOCAL_PR_FMT " queue:%d",
- LOCAL_PR_ARG, __entry->queue
+ LOCAL_PR_FMT VIF_PR_FMT " queue:%d",
+ LOCAL_PR_ARG, VIF_PR_ARG, __entry->queue
)
);