History

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

John W. Linville committed 13 years ago

Commit c1f3bb62 parents dcd6077 3c57e8689 files · +3037 −1517Browse files

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

Unified · Split

include/uapi/linux/nl80211.h+22−5
@@ -988,7 +988,7 @@ enum nl80211_commands { · 987 unmodified lines
988988 * to query the CRDA to retrieve one regulatory domain. This attribute can
989989 * also be used by userspace to query the kernel for the currently set
990990 * regulatory domain. We chose an alpha2 as that is also used by the
991− * IEEE-802.11d country information element to identify a country.
991+ * IEEE-802.11 country information element to identify a country.
992992 * Users can also simply ask the wireless core to set regulatory domain
993993 * to a specific alpha2.
994994 * @NL80211_ATTR_REG_RULES: a nested array of regulatory domain regulatory
@@ -1496,6 +1496,18 @@ enum nl80211_commands { · 501 unmodified lines
14961496 * @NL80211_ATTR_RXMGMT_FLAGS: flags for nl80211_send_mgmt(), u32.
14971497 * As specified in the &enum nl80211_rxmgmt_flags.
14981498 *
1499+ * @NL80211_ATTR_STA_SUPPORTED_CHANNELS: array of supported channels.
1500+ *
1501+ * @NL80211_ATTR_STA_SUPPORTED_OPER_CLASSES: array of supported
1502+ * supported operating classes.
1503+ *
1504+ * @NL80211_ATTR_HANDLE_DFS: A flag indicating whether user space
1505+ * controls DFS operation in IBSS mode. If the flag is included in
1506+ * %NL80211_CMD_JOIN_IBSS request, the driver will allow use of DFS
1507+ * channels and reports radar events to userspace. Userspace is required
1508+ * to react to radar events, e.g. initiate a channel switch or leave the
1509+ * IBSS network.
1510+ *
14991511 * @NL80211_ATTR_MAX: highest attribute number currently defined
15001512 * @__NL80211_ATTR_AFTER_LAST: internal use
15011513 */
@@ -1806,6 +1818,12 @@ enum nl80211_attrs { · 304 unmodified lines
18061818
18071819 NL80211_ATTR_RXMGMT_FLAGS,
18081820
1821+ NL80211_ATTR_STA_SUPPORTED_CHANNELS,
1822+
1823+ NL80211_ATTR_STA_SUPPORTED_OPER_CLASSES,
1824+
1825+ NL80211_ATTR_HANDLE_DFS,
1826+
18091827 /* add attributes here, update the policy in nl80211.c */
18101828
18111829 __NL80211_ATTR_AFTER_LAST,
@@ -3860,13 +3878,12 @@ enum nl80211_radar_event { · 2048 unmodified lines
38603878 *
38613879 * Channel states used by the DFS code.
38623880 *
3863− * @IEEE80211_DFS_USABLE: The channel can be used, but channel availability
3881+ * @NL80211_DFS_USABLE: The channel can be used, but channel availability
38643882 * check (CAC) must be performed before using it for AP or IBSS.
3865− * @IEEE80211_DFS_UNAVAILABLE: A radar has been detected on this channel, it
3883+ * @NL80211_DFS_UNAVAILABLE: A radar has been detected on this channel, it
38663884 * is therefore marked as not available.
3867− * @IEEE80211_DFS_AVAILABLE: The channel has been CAC checked and is available.
3885+ * @NL80211_DFS_AVAILABLE: The channel has been CAC checked and is available.
38683886 */
3869−
38703887 enum nl80211_dfs_state {
38713888 NL80211_DFS_USABLE,
38723889 NL80211_DFS_UNAVAILABLE,