Johannes Berg says: ==================== Lots of updates for net-next; along with the usual flurry of small fixes, cleanups and internal features we have: * VHT support for TDLS and IBSS (conditional on drivers though) * first TX performance improvements (the biggest will come later) * many suspend/resume (race) fixes * name_assign_type support from Tom Gundersen ====================
Showing the changes to include/uapi (1 of 72 files). Show all
Unified · Split
| @@ -25,6 +25,19 @@ · 24 unmodified lines | |||
| 25 | * | 25 | * |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | /* | ||
| 29 | * This header file defines the userspace API to the wireless stack. Please | ||
| 30 | * be careful not to break things - i.e. don't move anything around or so | ||
| 31 | * unless you can demonstrate that it breaks neither API nor ABI. | ||
| 32 | * | ||
| 33 | * Additions to the API should be accompanied by actual implementations in | ||
| 34 | * an upstream driver, so that example implementations exist in case there | ||
| 35 | * are ever concerns about the precise semantics of the API or changes are | ||
| 36 | * needed, and to ensure that code for dead (no longer implemented) API | ||
| 37 | * can actually be identified and removed. | ||
| 38 | * Nonetheless, semantics should also be documented carefully in this file. | ||
| 39 | */ | ||
| 40 | |||
| 28 | #include <linux/types.h> | 41 | #include <linux/types.h> |
| 29 | 42 | ||
| 30 | #define NL80211_GENL_NAME "nl80211" | 43 | #define NL80211_GENL_NAME "nl80211" |
| @@ -1684,6 +1697,10 @@ enum nl80211_commands { · 1653 unmodified lines | |||
| 1684 | * If set during scheduled scan start then the new scan req will be | 1697 | * If set during scheduled scan start then the new scan req will be |
| 1685 | * owned by the netlink socket that created it and the scheduled scan will | 1698 | * owned by the netlink socket that created it and the scheduled scan will |
| 1686 | * be stopped when the socket is closed. | 1699 | * be stopped when the socket is closed. |
| 1700 | * If set during configuration of regulatory indoor operation then the | ||
| 1701 | * regulatory indoor configuration would be owned by the netlink socket | ||
| 1702 | * that configured the indoor setting, and the indoor operation would be | ||
| 1703 | * cleared when the socket is closed. | ||
| 1687 | * | 1704 | * |
| 1688 | * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is | 1705 | * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is |
| 1689 | * the TDLS link initiator. | 1706 | * the TDLS link initiator. |
| @@ -1737,8 +1754,12 @@ enum nl80211_commands { · 47 unmodified lines | |||
| 1737 | * should be contained in the result as the sum of the respective counters | 1754 | * should be contained in the result as the sum of the respective counters |
| 1738 | * over all channels. | 1755 | * over all channels. |
| 1739 | * | 1756 | * |
| 1740 | * @NL80211_ATTR_SCHED_SCAN_DELAY: delay before a scheduled scan (or a | 1757 | * @NL80211_ATTR_SCHED_SCAN_DELAY: delay before the first cycle of a |
| 1741 | * WoWLAN net-detect scan) is started, u32 in seconds. | 1758 | * scheduled scan (or a WoWLAN net-detect scan) is started, u32 |
| 1759 | * in seconds. | ||
| 1760 | |||
| 1761 | * @NL80211_ATTR_REG_INDOOR: flag attribute, if set indicates that the device | ||
| 1762 | * is operating in an indoor environment. | ||
| 1742 | * | 1763 | * |
| 1743 | * @NUM_NL80211_ATTR: total number of nl80211_attrs available | 1764 | * @NUM_NL80211_ATTR: total number of nl80211_attrs available |
| 1744 | * @NL80211_ATTR_MAX: highest attribute number currently defined | 1765 | * @NL80211_ATTR_MAX: highest attribute number currently defined |
| @@ -2107,6 +2128,8 @@ enum nl80211_attrs { · 362 unmodified lines | |||
| 2107 | 2128 | ||
| 2108 | NL80211_ATTR_SCHED_SCAN_DELAY, | 2129 | NL80211_ATTR_SCHED_SCAN_DELAY, |
| 2109 | 2130 | ||
| 2131 | NL80211_ATTR_REG_INDOOR, | ||
| 2132 | |||
| 2110 | /* add attributes here, update the policy in nl80211.c */ | 2133 | /* add attributes here, update the policy in nl80211.c */ |
| 2111 | 2134 | ||
| 2112 | __NL80211_ATTR_AFTER_LAST, | 2135 | __NL80211_ATTR_AFTER_LAST, |
| @@ -3092,7 +3115,8 @@ enum nl80211_mesh_power_mode { · 979 unmodified lines | |||
| 3092 | * | 3115 | * |
| 3093 | * @NL80211_MESHCONF_PLINK_TIMEOUT: If no tx activity is seen from a STA we've | 3116 | * @NL80211_MESHCONF_PLINK_TIMEOUT: If no tx activity is seen from a STA we've |
| 3094 | * established peering with for longer than this time (in seconds), then | 3117 | * established peering with for longer than this time (in seconds), then |
| 3095 | * remove it from the STA's list of peers. Default is 30 minutes. | 3118 | * remove it from the STA's list of peers. You may set this to 0 to disable |
| 3119 | * the removal of the STA. Default is 30 minutes. | ||
| 3096 | * | 3120 | * |
| 3097 | * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use | 3121 | * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use |
| 3098 | */ | 3122 | */ |
| @@ -3694,6 +3718,8 @@ struct nl80211_pattern_support { · 595 unmodified lines | |||
| 3694 | * @NL80211_WOWLAN_TRIG_ANY: wake up on any activity, do not really put | 3718 | * @NL80211_WOWLAN_TRIG_ANY: wake up on any activity, do not really put |
| 3695 | * the chip into a special state -- works best with chips that have | 3719 | * the chip into a special state -- works best with chips that have |
| 3696 | * support for low-power operation already (flag) | 3720 | * support for low-power operation already (flag) |
| 3721 | * Note that this mode is incompatible with all of the others, if | ||
| 3722 | * any others are even supported by the device. | ||
| 3697 | * @NL80211_WOWLAN_TRIG_DISCONNECT: wake up on disconnect, the way disconnect | 3723 | * @NL80211_WOWLAN_TRIG_DISCONNECT: wake up on disconnect, the way disconnect |
| 3698 | * is detected is implementation-specific (flag) | 3724 | * is detected is implementation-specific (flag) |
| 3699 | * @NL80211_WOWLAN_TRIG_MAGIC_PKT: wake up on magic packet (6x 0xff, followed | 3725 | * @NL80211_WOWLAN_TRIG_MAGIC_PKT: wake up on magic packet (6x 0xff, followed |
| @@ -4327,11 +4353,13 @@ enum nl80211_feature_flags { · 627 unmodified lines | |||
| 4327 | 4353 | ||
| 4328 | /** | 4354 | /** |
| 4329 | * enum nl80211_ext_feature_index - bit index of extended features. | 4355 | * enum nl80211_ext_feature_index - bit index of extended features. |
| 4356 | * @NL80211_EXT_FEATURE_VHT_IBSS: This driver supports IBSS with VHT datarates. | ||
| 4330 | * | 4357 | * |
| 4331 | * @NUM_NL80211_EXT_FEATURES: number of extended features. | 4358 | * @NUM_NL80211_EXT_FEATURES: number of extended features. |
| 4332 | * @MAX_NL80211_EXT_FEATURES: highest extended feature index. | 4359 | * @MAX_NL80211_EXT_FEATURES: highest extended feature index. |
| 4333 | */ | 4360 | */ |
| 4334 | enum nl80211_ext_feature_index { | 4361 | enum nl80211_ext_feature_index { |
| 4362 | NL80211_EXT_FEATURE_VHT_IBSS, | ||
| 4335 | 4363 | ||
| 4336 | /* add new features before the definition below */ | 4364 | /* add new features before the definition below */ |
| 4337 | NUM_NL80211_EXT_FEATURES, | 4365 | NUM_NL80211_EXT_FEATURES, |