diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-10-24 10:59:25 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-10-30 09:11:34 +0100 |
| commit | 1ea6f9c0d48b11b6ec3ec4b5579ec74fc3951cf8 (patch) | |
| tree | 5a589d0bccfcac6ba0952942a04482b99752ddcc /net/mac80211/trace.h | |
| parent | c8442118ad9cd05cfe3b993f058e70ab25b1009a (diff) | |
mac80211: handle TX power per virtual interface
Even before channel contexts/multi-channel, having a
single global TX power limit was already problematic,
in particular if two managed interfaces connected to
two APs with different power constraints. The channel
context introduction completely broke this though and
in fact I had disabled TX power configuration there
for drivers using channel contexts.
Change everything to track TX power per interface so
that different user settings and different channel
maxima are treated correctly. Also continue tracking
the global TX power though for compatibility with
applications that attempt to configure the wiphy's
TX power globally.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/trace.h')
| -rw-r--r-- | net/mac80211/trace.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h index 5e74e77cba9..eeebbd9cb88 100644 --- a/net/mac80211/trace.h +++ b/net/mac80211/trace.h @@ -342,6 +342,7 @@ TRACE_EVENT(drv_bss_info_changed, __field(bool, ps); __dynamic_array(u8, ssid, info->ssid_len); __field(bool, hidden_ssid); + __field(int, txpower) ), TP_fast_assign( @@ -376,6 +377,7 @@ TRACE_EVENT(drv_bss_info_changed, __entry->ps = info->ps; memcpy(__get_dynamic_array(ssid), info->ssid, info->ssid_len); __entry->hidden_ssid = info->hidden_ssid; + __entry->txpower = info->txpower; ), TP_printk( |