diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-03-25 18:29:27 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-16 15:29:44 +0200 |
| commit | 85220d71bf3ca1ba9129e0744247ae5f61bec559 (patch) | |
| tree | 5bdabc71bc5da27ee71fb1272b86809ac2f95b0d /net/mac80211/trace.h | |
| parent | b4f286a1c0ad0b84c2d502b354d4d98d5a86c64b (diff) | |
| download | linux-stable-85220d71bf3ca1ba9129e0744247ae5f61bec559.tar.gz linux-stable-85220d71bf3ca1ba9129e0744247ae5f61bec559.tar.bz2 linux-stable-85220d71bf3ca1ba9129e0744247ae5f61bec559.zip | |
mac80211: support secondary channel offset in CSA
Add support for the secondary channel offset IE in channel
switch announcements. This is necessary for proper handling
of CSA on HT access points.
For this to work it is also necessary to convert everything
here to use chandef structs instead of just channels. The
driver updates aren't really correct though. In particular,
the TI wl18xx driver update can't possibly be right since
it just ignores the new channel width for lack of firmware
API.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/trace.h')
| -rw-r--r-- | net/mac80211/trace.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h index 8286dcef228b..c215fafd7a2f 100644 --- a/net/mac80211/trace.h +++ b/net/mac80211/trace.h @@ -990,23 +990,23 @@ TRACE_EVENT(drv_channel_switch, TP_STRUCT__entry( LOCAL_ENTRY + CHANDEF_ENTRY __field(u64, timestamp) __field(bool, block_tx) - __field(u16, freq) __field(u8, count) ), TP_fast_assign( LOCAL_ASSIGN; + CHANDEF_ASSIGN(&ch_switch->chandef) __entry->timestamp = ch_switch->timestamp; __entry->block_tx = ch_switch->block_tx; - __entry->freq = ch_switch->channel->center_freq; __entry->count = ch_switch->count; ), TP_printk( - LOCAL_PR_FMT " new freq:%u count:%d", - LOCAL_PR_ARG, __entry->freq, __entry->count + LOCAL_PR_FMT " new " CHANDEF_PR_FMT " count:%d", + LOCAL_PR_ARG, CHANDEF_PR_ARG, __entry->count ) ); |