diff options
Diffstat (limited to 'include/net/regulatory.h')
-rw-r--r-- | include/net/regulatory.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/include/net/regulatory.h b/include/net/regulatory.h index b07cdc9fa454..75fc1f5a948d 100644 --- a/include/net/regulatory.h +++ b/include/net/regulatory.h | |||
@@ -155,6 +155,7 @@ struct ieee80211_reg_rule { | |||
155 | struct ieee80211_freq_range freq_range; | 155 | struct ieee80211_freq_range freq_range; |
156 | struct ieee80211_power_rule power_rule; | 156 | struct ieee80211_power_rule power_rule; |
157 | u32 flags; | 157 | u32 flags; |
158 | u32 dfs_cac_ms; | ||
158 | }; | 159 | }; |
159 | 160 | ||
160 | struct ieee80211_regdomain { | 161 | struct ieee80211_regdomain { |
@@ -172,14 +173,18 @@ struct ieee80211_regdomain { | |||
172 | #define DBM_TO_MBM(gain) ((gain) * 100) | 173 | #define DBM_TO_MBM(gain) ((gain) * 100) |
173 | #define MBM_TO_DBM(gain) ((gain) / 100) | 174 | #define MBM_TO_DBM(gain) ((gain) / 100) |
174 | 175 | ||
175 | #define REG_RULE(start, end, bw, gain, eirp, reg_flags) \ | 176 | #define REG_RULE_EXT(start, end, bw, gain, eirp, dfs_cac, reg_flags) \ |
176 | { \ | 177 | { \ |
177 | .freq_range.start_freq_khz = MHZ_TO_KHZ(start), \ | 178 | .freq_range.start_freq_khz = MHZ_TO_KHZ(start), \ |
178 | .freq_range.end_freq_khz = MHZ_TO_KHZ(end), \ | 179 | .freq_range.end_freq_khz = MHZ_TO_KHZ(end), \ |
179 | .freq_range.max_bandwidth_khz = MHZ_TO_KHZ(bw), \ | 180 | .freq_range.max_bandwidth_khz = MHZ_TO_KHZ(bw), \ |
180 | .power_rule.max_antenna_gain = DBI_TO_MBI(gain),\ | 181 | .power_rule.max_antenna_gain = DBI_TO_MBI(gain), \ |
181 | .power_rule.max_eirp = DBM_TO_MBM(eirp), \ | 182 | .power_rule.max_eirp = DBM_TO_MBM(eirp), \ |
182 | .flags = reg_flags, \ | 183 | .flags = reg_flags, \ |
184 | .dfs_cac_ms = dfs_cac, \ | ||
183 | } | 185 | } |
184 | 186 | ||
187 | #define REG_RULE(start, end, bw, gain, eirp, reg_flags) \ | ||
188 | REG_RULE_EXT(start, end, bw, gain, eirp, 0, reg_flags) | ||
189 | |||
185 | #endif | 190 | #endif |