2013-02-08 20:30:55

by Johannes Berg

Subject: [PATCH] mac80211: fix chandef tracing bug

From: Johannes Berg <[email protected]>

The chandef tracing writes center_freq1 twice, so
that it is always 0 (no driver supports 80+80 yet)
and leaves center_freq2 unset. Fix this mistake.

Signed-off-by: Johannes Berg <[email protected]>
---
net/mac80211/trace.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index dd2b80a..0bdd7ae 100644
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -36,7 +36,7 @@
__entry->control_freq = (c)->chan->center_freq; \
__entry->chan_width = (c)->width; \
__entry->center_freq1 = (c)->center_freq1; \
- __entry->center_freq1 = (c)->center_freq2;
+ __entry->center_freq2 = (c)->center_freq2;
#define CHANDEF_PR_FMT " control:%d MHz width:%d center: %d/%d MHz"
#define CHANDEF_PR_ARG __entry->control_freq, __entry->chan_width, \
__entry->center_freq1, __entry->center_freq2
--
1.8.0

2013-02-11 11:47:34

by Johannes Berg

Subject: Re: [PATCH] mac80211: fix chandef tracing bug

On Fri, 2013-02-08 at 21:30 +0100, Johannes Berg wrote:
> From: Johannes Berg <[email protected]>
>
> The chandef tracing writes center_freq1 twice, so
> that it is always 0 (no driver supports 80+80 yet)
> and leaves center_freq2 unset. Fix this mistake.

Applied.

johannes