2013-02-15 19:16:04

by Seth Forshee

Subject: [PATCH] mac80211: Fix incorrect use of STA_PR_FMT in trace points

Several tracepoints are using STA_PR_FMT where STA_PR_ARG should be
used, resulting in messages like "phy0 sta:ARG TYPE NOT FIELD BUT 1".
Change these to STA_PR_ARG.

Signed-off-by: Seth Forshee <[email protected]>
---
net/mac80211/trace.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index 0bdd7ae..d873421 100644
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -479,7 +479,7 @@ TRACE_EVENT(drv_set_tim,

TP_printk(
LOCAL_PR_FMT STA_PR_FMT " set:%d",
- LOCAL_PR_ARG, STA_PR_FMT, __entry->set
+ LOCAL_PR_ARG, STA_PR_ARG, __entry->set
)
);

@@ -1684,7 +1684,7 @@ TRACE_EVENT(api_sta_block_awake,

TP_printk(
LOCAL_PR_FMT STA_PR_FMT " block:%d",
- LOCAL_PR_ARG, STA_PR_FMT, __entry->block
+ LOCAL_PR_ARG, STA_PR_ARG, __entry->block
)
);

@@ -1782,7 +1782,7 @@ TRACE_EVENT(api_eosp,

TP_printk(
LOCAL_PR_FMT STA_PR_FMT,
- LOCAL_PR_ARG, STA_PR_FMT
+ LOCAL_PR_ARG, STA_PR_ARG
)
);

--
1.7.9.5

2013-02-15 19:24:53

by Johannes Berg

Subject: Re: [PATCH] mac80211: Fix incorrect use of STA_PR_FMT in trace points

On Fri, 2013-02-15 at 13:15 -0600, Seth Forshee wrote:
> Several tracepoints are using STA_PR_FMT where STA_PR_ARG should be
> used, resulting in messages like "phy0 sta:ARG TYPE NOT FIELD BUT 1".
> Change these to STA_PR_ARG.

Heh, I'd seen them but never found the cause ... thanks, applied!

johannes