History

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

John W. Linville committed 13 years ago

Commit fa597842 parents 2437f3c 73da7d519 files · +772 −34Browse files

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

Unified · Split

include/uapi/linux/nl80211.h+30−0
@@ -676,6 +676,16 @@ · 675 unmodified lines
676 * @NL80211_CMD_GET_COALESCE: Get currently supported coalesce rules.676 * @NL80211_CMD_GET_COALESCE: Get currently supported coalesce rules.
677 * @NL80211_CMD_SET_COALESCE: Configure coalesce rules or clear existing rules.677 * @NL80211_CMD_SET_COALESCE: Configure coalesce rules or clear existing rules.
678 *678 *
679 * @NL80211_CMD_CHANNEL_SWITCH: Perform a channel switch by announcing the
680 * the new channel information (Channel Switch Announcement - CSA)
681 * in the beacon for some time (as defined in the
682 * %NL80211_ATTR_CH_SWITCH_COUNT parameter) and then change to the
683 * new channel. Userspace provides the new channel information (using
684 * %NL80211_ATTR_WIPHY_FREQ and the attributes determining channel
685 * width). %NL80211_ATTR_CH_SWITCH_BLOCK_TX may be supplied to inform
686 * other station that transmission must be blocked until the channel
687 * switch is complete.
688 *
679 * @NL80211_CMD_MAX: highest used command number689 * @NL80211_CMD_MAX: highest used command number
680 * @__NL80211_CMD_AFTER_LAST: internal use690 * @__NL80211_CMD_AFTER_LAST: internal use
681 */691 */
@@ -841,6 +851,8 @@ enum nl80211_commands { · 159 unmodified lines
841 NL80211_CMD_GET_COALESCE,851 NL80211_CMD_GET_COALESCE,
842 NL80211_CMD_SET_COALESCE,852 NL80211_CMD_SET_COALESCE,
843 853
854 NL80211_CMD_CHANNEL_SWITCH,
855
844 /* add new commands above here */856 /* add new commands above here */
845 857
846 /* used to define NL80211_CMD_MAX below */858 /* used to define NL80211_CMD_MAX below */
@@ -1469,6 +1481,18 @@ enum nl80211_commands { · 622 unmodified lines
1469 *1481 *
1470 * @NL80211_ATTR_COALESCE_RULE: Coalesce rule information.1482 * @NL80211_ATTR_COALESCE_RULE: Coalesce rule information.
1471 *1483 *
1484 * @NL80211_ATTR_CH_SWITCH_COUNT: u32 attribute specifying the number of TBTT's
1485 * until the channel switch event.
1486 * @NL80211_ATTR_CH_SWITCH_BLOCK_TX: flag attribute specifying that transmission
1487 * must be blocked on the current channel (before the channel switch
1488 * operation).
1489 * @NL80211_ATTR_CSA_IES: Nested set of attributes containing the IE information
1490 * for the time while performing a channel switch.
1491 * @NL80211_ATTR_CSA_C_OFF_BEACON: Offset of the channel switch counter
1492 * field in the beacons tail (%NL80211_ATTR_BEACON_TAIL).
1493 * @NL80211_ATTR_CSA_C_OFF_PRESP: Offset of the channel switch counter
1494 * field in the probe response (%NL80211_ATTR_PROBE_RESP).
1495 *
1472 * @NL80211_ATTR_MAX: highest attribute number currently defined1496 * @NL80211_ATTR_MAX: highest attribute number currently defined
1473 * @__NL80211_ATTR_AFTER_LAST: internal use1497 * @__NL80211_ATTR_AFTER_LAST: internal use
1474 */1498 */
@@ -1771,6 +1795,12 @@ enum nl80211_attrs { · 296 unmodified lines
1771 1795
1772 NL80211_ATTR_COALESCE_RULE,1796 NL80211_ATTR_COALESCE_RULE,
1773 1797
1798 NL80211_ATTR_CH_SWITCH_COUNT,
1799 NL80211_ATTR_CH_SWITCH_BLOCK_TX,
1800 NL80211_ATTR_CSA_IES,
1801 NL80211_ATTR_CSA_C_OFF_BEACON,
1802 NL80211_ATTR_CSA_C_OFF_PRESP,
1803
1774 /* add attributes here, update the policy in nl80211.c */1804 /* add attributes here, update the policy in nl80211.c */
1775 1805
1776 __NL80211_ATTR_AFTER_LAST,1806 __NL80211_ATTR_AFTER_LAST,