History

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

John W. Linville committed 12 years ago

Commit 406a94d2 parents c25aaf8 48d11dc213 files · +6045 −3415Browse files

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

Unified · Split

include/uapi/linux/nl80211.h+42−0
@@ -1579,6 +1579,10 @@ enum nl80211_commands { · 1578 unmodified lines
15791579 * @NL80211_ATTR_TDLS_PEER_CAPABILITY: flags for TDLS peer capabilities, u32.
15801580 * As specified in the &enum nl80211_tdls_peer_capability.
15811581 *
1582+ * @NL80211_ATTR_IFACE_SOCKET_OWNER: flag attribute, if set during interface
1583+ * creation then the new interface will be owned by the netlink socket
1584+ * that created it and will be destroyed when the socket is closed
1585+ *
15821586 * @NL80211_ATTR_MAX: highest attribute number currently defined
15831587 * @__NL80211_ATTR_AFTER_LAST: internal use
15841588 */
@@ -1914,6 +1918,8 @@ enum nl80211_attrs { · 329 unmodified lines
19141918
19151919 NL80211_ATTR_TDLS_PEER_CAPABILITY,
19161920
1921+ NL80211_ATTR_IFACE_SOCKET_OWNER,
1922+
19171923 /* add attributes here, update the policy in nl80211.c */
19181924
19191925 __NL80211_ATTR_AFTER_LAST,
@@ -2336,9 +2342,34 @@ enum nl80211_band_attr { · 416 unmodified lines
23362342 * using this channel as the primary or any of the secondary channels
23372343 * isn't possible
23382344 * @NL80211_FREQUENCY_ATTR_DFS_CAC_TIME: DFS CAC time in milliseconds.
2345+ * @NL80211_FREQUENCY_ATTR_INDOOR_ONLY: Only indoor use is permitted on this
2346+ * channel. A channel that has the INDOOR_ONLY attribute can only be
2347+ * used when there is a clear assessment that the device is operating in
2348+ * an indoor surroundings, i.e., it is connected to AC power (and not
2349+ * through portable DC inverters) or is under the control of a master
2350+ * that is acting as an AP and is connected to AC power.
2351+ * @NL80211_FREQUENCY_ATTR_GO_CONCURRENT: GO operation is allowed on this
2352+ * channel if it's connected concurrently to a BSS on the same channel on
2353+ * the 2 GHz band or to a channel in the same UNII band (on the 5 GHz
2354+ * band), and IEEE80211_CHAN_RADAR is not set. Instantiating a GO on a
2355+ * channel that has the GO_CONCURRENT attribute set can be done when there
2356+ * is a clear assessment that the device is operating under the guidance of
2357+ * an authorized master, i.e., setting up a GO while the device is also
2358+ * connected to an AP with DFS and radar detection on the UNII band (it is
2359+ * up to user-space, i.e., wpa_supplicant to perform the required
2360+ * verifications)
2361+ * @NL80211_FREQUENCY_ATTR_NO_20MHZ: 20 MHz operation is not allowed
2362+ * on this channel in current regulatory domain.
2363+ * @NL80211_FREQUENCY_ATTR_NO_10MHZ: 10 MHz operation is not allowed
2364+ * on this channel in current regulatory domain.
23392365 * @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number
23402366 * currently defined
23412367 * @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use
2368+ *
2369+ * See https://apps.fcc.gov/eas/comments/GetPublishedDocument.html?id=327&tn=528122
2370+ * for more information on the FCC description of the relaxations allowed
2371+ * by NL80211_FREQUENCY_ATTR_INDOOR_ONLY and
2372+ * NL80211_FREQUENCY_ATTR_GO_CONCURRENT.
23422373 */
23432374 enum nl80211_frequency_attr {
23442375 __NL80211_FREQUENCY_ATTR_INVALID,
@@ -2355,6 +2386,10 @@ enum nl80211_frequency_attr { · 10 unmodified lines
23552386 NL80211_FREQUENCY_ATTR_NO_80MHZ,
23562387 NL80211_FREQUENCY_ATTR_NO_160MHZ,
23572388 NL80211_FREQUENCY_ATTR_DFS_CAC_TIME,
2389+ NL80211_FREQUENCY_ATTR_INDOOR_ONLY,
2390+ NL80211_FREQUENCY_ATTR_GO_CONCURRENT,
2391+ NL80211_FREQUENCY_ATTR_NO_20MHZ,
2392+ NL80211_FREQUENCY_ATTR_NO_10MHZ,
23582393
23592394 /* keep last */
23602395 __NL80211_FREQUENCY_ATTR_AFTER_LAST,
@@ -2573,10 +2608,13 @@ enum nl80211_dfs_regions { · 212 unmodified lines
25732608 * present has been registered with the wireless core that
25742609 * has listed NL80211_FEATURE_CELL_BASE_REG_HINTS as a
25752610 * supported feature.
2611+ * @NL80211_USER_REG_HINT_INDOOR: a user sent an hint indicating that the
2612+ * platform is operating in an indoor environment.
25762613 */
25772614 enum nl80211_user_reg_hint_type {
25782615 NL80211_USER_REG_HINT_USER = 0,
25792616 NL80211_USER_REG_HINT_CELL_BASE = 1,
2617+ NL80211_USER_REG_HINT_INDOOR = 2,
25802618 };
25812619
25822620 /**
@@ -3891,6 +3929,9 @@ enum nl80211_ap_sme_features { · 1308 unmodified lines
38913929 * interface. An active monitor interface behaves like a normal monitor
38923930 * interface, but gets added to the driver. It ensures that incoming
38933931 * unicast packets directed at the configured interface address get ACKed.
3932+ * @NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE: This driver supports dynamic
3933+ * channel bandwidth change (e.g., HT 20 <-> 40 MHz channel) during the
3934+ * lifetime of a BSS.
38943935 */
38953936 enum nl80211_feature_flags {
38963937 NL80211_FEATURE_SK_TX_STATUS = 1 << 0,
@@ -3911,6 +3952,7 @@ enum nl80211_feature_flags { · 14 unmodified lines
39113952 NL80211_FEATURE_FULL_AP_CLIENT_STATE = 1 << 15,
39123953 NL80211_FEATURE_USERSPACE_MPM = 1 << 16,
39133954 NL80211_FEATURE_ACTIVE_MONITOR = 1 << 17,
3955+ NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE = 1 << 18,
39143956 };
39153957
39163958 /**

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t