History

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

John W. Linville committed 12 years ago

Commit 7eb24502 parents 474a41e 73fb08e27 files · +339 −195Browse files

Showing the changes to include/uapi/linux (1 of 27 files). Show all

Unified · Split

include/uapi/linux/nl80211.h+6−0
@@ -2335,6 +2335,7 @@ enum nl80211_band_attr { · 2334 unmodified lines
23352335 * @NL80211_FREQUENCY_ATTR_NO_160MHZ: any 160 MHz (but not 80+80) channel
23362336 * using this channel as the primary or any of the secondary channels
23372337 * isn't possible
2338+ * @NL80211_FREQUENCY_ATTR_DFS_CAC_TIME: DFS CAC time in milliseconds.
23382339 * @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number
23392340 * currently defined
23402341 * @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use
@@ -2353,6 +2354,7 @@ enum nl80211_frequency_attr { · 12 unmodified lines
23532354 NL80211_FREQUENCY_ATTR_NO_HT40_PLUS,
23542355 NL80211_FREQUENCY_ATTR_NO_80MHZ,
23552356 NL80211_FREQUENCY_ATTR_NO_160MHZ,
2357+ NL80211_FREQUENCY_ATTR_DFS_CAC_TIME,
23562358
23572359 /* keep last */
23582360 __NL80211_FREQUENCY_ATTR_AFTER_LAST,
@@ -2449,6 +2451,8 @@ enum nl80211_reg_type { · 90 unmodified lines
24492451 * If you don't have one then don't send this.
24502452 * @NL80211_ATTR_POWER_RULE_MAX_EIRP: the maximum allowed EIRP for
24512453 * a given frequency range. The value is in mBm (100 * dBm).
2454+ * @NL80211_ATTR_DFS_CAC_TIME: DFS CAC time in milliseconds.
2455+ * If not present or 0 default CAC time will be used.
24522456 * @NL80211_REG_RULE_ATTR_MAX: highest regulatory rule attribute number
24532457 * currently defined
24542458 * @__NL80211_REG_RULE_ATTR_AFTER_LAST: internal use
@@ -2464,6 +2468,8 @@ enum nl80211_reg_rule_attr { · 9 unmodified lines
24642468 NL80211_ATTR_POWER_RULE_MAX_ANT_GAIN,
24652469 NL80211_ATTR_POWER_RULE_MAX_EIRP,
24662470
2471+ NL80211_ATTR_DFS_CAC_TIME,
2472+
24672473 /* keep last */
24682474 __NL80211_REG_RULE_ATTR_AFTER_LAST,
24692475 NL80211_REG_RULE_ATTR_MAX = __NL80211_REG_RULE_ATTR_AFTER_LAST - 1