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 4b074b02 parents 7d68849 ddcc34781 files · +2897 −1386Browse files

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

Unified · Split

include/uapi/linux/nl80211.h+36−11
@@ -581,7 +581,14 @@ · 580 unmodified lines
581581 * operation, %NL80211_ATTR_MAC contains the peer MAC address, and
582582 * %NL80211_ATTR_REASON_CODE the reason code to be used (only with
583583 * %NL80211_TDLS_TEARDOWN).
584− * @NL80211_CMD_TDLS_MGMT: Send a TDLS management frame.
584+ * @NL80211_CMD_TDLS_MGMT: Send a TDLS management frame. The
585+ * %NL80211_ATTR_TDLS_ACTION attribute determines the type of frame to be
586+ * sent. Public Action codes (802.11-2012 8.1.5.1) will be sent as
587+ * 802.11 management frames, while TDLS action codes (802.11-2012
588+ * 8.5.13.1) will be encapsulated and sent as data frames. The currently
589+ * supported Public Action code is %WLAN_PUB_ACTION_TDLS_DISCOVER_RES
590+ * and the currently supported TDLS actions codes are given in
591+ * &enum ieee80211_tdls_actioncode.
585592 *
586593 * @NL80211_CMD_UNEXPECTED_FRAME: Used by an application controlling an AP
587594 * (or GO) interface (i.e. hostapd) to ask for unexpected frames to
@@ -1508,6 +1515,11 @@ enum nl80211_commands { · 920 unmodified lines
15081515 * to react to radar events, e.g. initiate a channel switch or leave the
15091516 * IBSS network.
15101517 *
1518+ * @NL80211_ATTR_SUPPORT_5_MHZ: A flag indicating that the device supports
1519+ * 5 MHz channel bandwidth.
1520+ * @NL80211_ATTR_SUPPORT_10_MHZ: A flag indicating that the device supports
1521+ * 10 MHz channel bandwidth.
1522+ *
15111523 * @NL80211_ATTR_MAX: highest attribute number currently defined
15121524 * @__NL80211_ATTR_AFTER_LAST: internal use
15131525 */
@@ -1824,6 +1836,9 @@ enum nl80211_attrs { · 310 unmodified lines
18241836
18251837 NL80211_ATTR_HANDLE_DFS,
18261838
1839+ NL80211_ATTR_SUPPORT_5_MHZ,
1840+ NL80211_ATTR_SUPPORT_10_MHZ,
1841+
18271842 /* add attributes here, update the policy in nl80211.c */
18281843
18291844 __NL80211_ATTR_AFTER_LAST,
@@ -2224,10 +2239,9 @@ enum nl80211_band_attr { · 394 unmodified lines
22242239 * @NL80211_FREQUENCY_ATTR_FREQ: Frequency in MHz
22252240 * @NL80211_FREQUENCY_ATTR_DISABLED: Channel is disabled in current
22262241 * regulatory domain.
2227− * @NL80211_FREQUENCY_ATTR_PASSIVE_SCAN: Only passive scanning is
2228− * permitted on this channel in current regulatory domain.
2229− * @NL80211_FREQUENCY_ATTR_NO_IBSS: IBSS networks are not permitted
2230− * on this channel in current regulatory domain.
2242+ * @NL80211_FREQUENCY_ATTR_NO_IR: no mechanisms that initiate radiation
2243+ * are permitted on this channel, this includes sending probe
2244+ * requests, or modes of operation that require beaconing.
22312245 * @NL80211_FREQUENCY_ATTR_RADAR: Radar detection is mandatory
22322246 * on this channel in current regulatory domain.
22332247 * @NL80211_FREQUENCY_ATTR_MAX_TX_POWER: Maximum transmission power in mBm
@@ -2254,8 +2268,8 @@ enum nl80211_frequency_attr { · 20 unmodified lines
22542268 __NL80211_FREQUENCY_ATTR_INVALID,
22552269 NL80211_FREQUENCY_ATTR_FREQ,
22562270 NL80211_FREQUENCY_ATTR_DISABLED,
2257− NL80211_FREQUENCY_ATTR_PASSIVE_SCAN,
2258− NL80211_FREQUENCY_ATTR_NO_IBSS,
2271+ NL80211_FREQUENCY_ATTR_NO_IR,
2272+ __NL80211_FREQUENCY_ATTR_NO_IBSS,
22592273 NL80211_FREQUENCY_ATTR_RADAR,
22602274 NL80211_FREQUENCY_ATTR_MAX_TX_POWER,
22612275 NL80211_FREQUENCY_ATTR_DFS_STATE,
@@ -2271,6 +2285,9 @@ enum nl80211_frequency_attr { · 9 unmodified lines
22712285 };
22722286
22732287 #define NL80211_FREQUENCY_ATTR_MAX_TX_POWER NL80211_FREQUENCY_ATTR_MAX_TX_POWER
2288+#define NL80211_FREQUENCY_ATTR_PASSIVE_SCAN NL80211_FREQUENCY_ATTR_NO_IR
2289+#define NL80211_FREQUENCY_ATTR_NO_IBSS NL80211_FREQUENCY_ATTR_NO_IR
2290+#define NL80211_FREQUENCY_ATTR_NO_IR NL80211_FREQUENCY_ATTR_NO_IR
22742291
22752292 /**
22762293 * enum nl80211_bitrate_attr - bitrate attributes
@@ -2413,8 +2430,9 @@ enum nl80211_sched_scan_match_attr { · 136 unmodified lines
24132430 * @NL80211_RRF_DFS: DFS support is required to be used
24142431 * @NL80211_RRF_PTP_ONLY: this is only for Point To Point links
24152432 * @NL80211_RRF_PTMP_ONLY: this is only for Point To Multi Point links
2416− * @NL80211_RRF_PASSIVE_SCAN: passive scan is required
2417− * @NL80211_RRF_NO_IBSS: no IBSS is allowed
2433+ * @NL80211_RRF_NO_IR: no mechanisms that initiate radiation are allowed,
2434+ * this includes probe requests or modes of operation that require
2435+ * beaconing.
24182436 */
24192437 enum nl80211_reg_rule_flags {
24202438 NL80211_RRF_NO_OFDM = 1<<0,
@@ -2424,10 +2442,17 @@ enum nl80211_reg_rule_flags { · 3 unmodified lines
24242442 NL80211_RRF_DFS = 1<<4,
24252443 NL80211_RRF_PTP_ONLY = 1<<5,
24262444 NL80211_RRF_PTMP_ONLY = 1<<6,
2427− NL80211_RRF_PASSIVE_SCAN = 1<<7,
2428− NL80211_RRF_NO_IBSS = 1<<8,
2445+ NL80211_RRF_NO_IR = 1<<7,
2446+ __NL80211_RRF_NO_IBSS = 1<<8,
24292447 };
24302448
2449+#define NL80211_RRF_PASSIVE_SCAN NL80211_RRF_NO_IR
2450+#define NL80211_RRF_NO_IBSS NL80211_RRF_NO_IR
2451+#define NL80211_RRF_NO_IR NL80211_RRF_NO_IR
2452+
2453+/* For backport compatibility with older userspace */
2454+#define NL80211_RRF_NO_IR_ALL (NL80211_RRF_NO_IR | __NL80211_RRF_NO_IBSS)
2455+
24312456 /**
24322457 * enum nl80211_dfs_regions - regulatory DFS regions
24332458 *