diff options
author | Hong Wu <Hong.Wu@dspg.com> | 2012-01-11 13:33:39 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-01-24 14:16:54 -0500 |
commit | eccc068e8e84c8fe997115629925e0422a98e4de (patch) | |
tree | 399c387868028130d6d9ca530cb23557103de4dc /include | |
parent | e2d75c136f8df4a4e28ece75c475a65b9292729a (diff) |
wireless: Save original maximum regulatory transmission power for the calucation of the local maximum transmit power
The local maximum transmit power is the maximum power a wireless device
allowed to transmit. If Power Constraint is presented, the local maximum
power equals to the maximum allowed power defined in regulatory domain
minus power constraint.
The maximum transmit power is maximum power a wireless device capable of
transmitting, and should be used in Power Capability element (7.3.2.16
IEEE802.11 2007).
The transmit power from a wireless device should not greater than the
local maximum transmit power.
The maximum transmit power was not calculated correctly in the current
Linux wireless/mac80211 when Power Constraint is presented.
Signed-off-by: Hong Wu <hong.wu@dspg.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/net/cfg80211.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 15f4be7d768e..208a7b5f8d49 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
@@ -120,6 +120,7 @@ enum ieee80211_channel_flags { | |||
120 | * @band: band this channel belongs to. | 120 | * @band: band this channel belongs to. |
121 | * @max_antenna_gain: maximum antenna gain in dBi | 121 | * @max_antenna_gain: maximum antenna gain in dBi |
122 | * @max_power: maximum transmission power (in dBm) | 122 | * @max_power: maximum transmission power (in dBm) |
123 | * @max_reg_power: maximum regulatory transmission power (in dBm) | ||
123 | * @beacon_found: helper to regulatory code to indicate when a beacon | 124 | * @beacon_found: helper to regulatory code to indicate when a beacon |
124 | * has been found on this channel. Use regulatory_hint_found_beacon() | 125 | * has been found on this channel. Use regulatory_hint_found_beacon() |
125 | * to enable this, this is useful only on 5 GHz band. | 126 | * to enable this, this is useful only on 5 GHz band. |
@@ -133,6 +134,7 @@ struct ieee80211_channel { | |||
133 | u32 flags; | 134 | u32 flags; |
134 | int max_antenna_gain; | 135 | int max_antenna_gain; |
135 | int max_power; | 136 | int max_power; |
137 | int max_reg_power; | ||
136 | bool beacon_found; | 138 | bool beacon_found; |
137 | u32 orig_flags; | 139 | u32 orig_flags; |
138 | int orig_mag, orig_mpwr; | 140 | int orig_mag, orig_mpwr; |