History

Merge tag 'mac80211-next-for-davem-2016-02-26' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Johannes Berg says: ==================== Here's another round of updates for -next: * big A-MSDU RX performance improvement (avoid linearize of paged RX) * rfkill changes: cleanups, documentation, platform properties * basic PBSS support in cfg80211 * MU-MIMO action frame processing support * BlockAck reordering & duplicate detection offload support * various cleanups & little fixes ====================

David S. Miller committed 10 years ago

Commit d67703f2 parents 4ec6207 50ee73880 files · +1518 −912Browse files

Showing the changes to include/uapi (2 of 80 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/nl80211.h +14 −0
  2. include/uapi/linux/rfkill.h +2 −0
include/uapi/linux/nl80211.h+14−0
@@ -1727,6 +1727,8 @@ enum nl80211_commands { · 1726 unmodified lines
1727 * underlying device supports these minimal RRM features:1727 * underlying device supports these minimal RRM features:
1728 * %NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES,1728 * %NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES,
1729 * %NL80211_FEATURE_QUIET,1729 * %NL80211_FEATURE_QUIET,
1730 * Or, if global RRM is supported, see:
1731 * %NL80211_EXT_FEATURE_RRM
1730 * If this flag is used, driver must add the Power Capabilities IE to the1732 * If this flag is used, driver must add the Power Capabilities IE to the
1731 * association request. In addition, it must also set the RRM capability1733 * association request. In addition, it must also set the RRM capability
1732 * flag in the association request's Capability Info field.1734 * flag in the association request's Capability Info field.
@@ -1789,6 +1791,10 @@ enum nl80211_commands { · 56 unmodified lines
1789 * thus it must not specify the number of iterations, only the interval1791 * thus it must not specify the number of iterations, only the interval
1790 * between scans. The scan plans are executed sequentially.1792 * between scans. The scan plans are executed sequentially.
1791 * Each scan plan is a nested attribute of &enum nl80211_sched_scan_plan.1793 * Each scan plan is a nested attribute of &enum nl80211_sched_scan_plan.
1794 * @NL80211_ATTR_PBSS: flag attribute. If set it means operate
1795 * in a PBSS. Specified in %NL80211_CMD_CONNECT to request
1796 * connecting to a PCP, and in %NL80211_CMD_START_AP to start
1797 * a PCP instead of AP. Relevant for DMG networks only.
1792 *1798 *
1793 * @NUM_NL80211_ATTR: total number of nl80211_attrs available1799 * @NUM_NL80211_ATTR: total number of nl80211_attrs available
1794 * @NL80211_ATTR_MAX: highest attribute number currently defined1800 * @NL80211_ATTR_MAX: highest attribute number currently defined
@@ -2164,6 +2170,8 @@ enum nl80211_attrs { · 369 unmodified lines
2164 NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS,2170 NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS,
2165 NL80211_ATTR_SCHED_SCAN_PLANS,2171 NL80211_ATTR_SCHED_SCAN_PLANS,
2166 2172
2173 NL80211_ATTR_PBSS,
2174
2167 /* add attributes here, update the policy in nl80211.c */2175 /* add attributes here, update the policy in nl80211.c */
2168 2176
2169 __NL80211_ATTR_AFTER_LAST,2177 __NL80211_ATTR_AFTER_LAST,
@@ -4396,12 +4404,18 @@ enum nl80211_feature_flags { · 2226 unmodified lines
4396/**4404/**
4397 * enum nl80211_ext_feature_index - bit index of extended features.4405 * enum nl80211_ext_feature_index - bit index of extended features.
4398 * @NL80211_EXT_FEATURE_VHT_IBSS: This driver supports IBSS with VHT datarates.4406 * @NL80211_EXT_FEATURE_VHT_IBSS: This driver supports IBSS with VHT datarates.
4407 * @NL80211_EXT_FEATURE_RRM: This driver supports RRM. When featured, user can
4408 * can request to use RRM (see %NL80211_ATTR_USE_RRM) with
4409 * %NL80211_CMD_ASSOCIATE and %NL80211_CMD_CONNECT requests, which will set
4410 * the ASSOC_REQ_USE_RRM flag in the association request even if
4411 * NL80211_FEATURE_QUIET is not advertized.
4399 *4412 *
4400 * @NUM_NL80211_EXT_FEATURES: number of extended features.4413 * @NUM_NL80211_EXT_FEATURES: number of extended features.
4401 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.4414 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
4402 */4415 */
4403enum nl80211_ext_feature_index {4416enum nl80211_ext_feature_index {
4404 NL80211_EXT_FEATURE_VHT_IBSS,4417 NL80211_EXT_FEATURE_VHT_IBSS,
4418 NL80211_EXT_FEATURE_RRM,
4405 4419
4406 /* add new features before the definition below */4420 /* add new features before the definition below */
4407 NUM_NL80211_EXT_FEATURES,4421 NUM_NL80211_EXT_FEATURES,
include/uapi/linux/rfkill.h+2−0
@@ -59,6 +59,8 @@ enum rfkill_type { · 58 unmodified lines
59 * @RFKILL_OP_DEL: a device was removed59 * @RFKILL_OP_DEL: a device was removed
60 * @RFKILL_OP_CHANGE: a device's state changed -- userspace changes one device60 * @RFKILL_OP_CHANGE: a device's state changed -- userspace changes one device
61 * @RFKILL_OP_CHANGE_ALL: userspace changes all devices (of a type, or all)61 * @RFKILL_OP_CHANGE_ALL: userspace changes all devices (of a type, or all)
62 * into a state, also updating the default state used for devices that
63 * are hot-plugged later.
62 */64 */
63enum rfkill_operation {65enum rfkill_operation {
64 RFKILL_OP_ADD = 0,66 RFKILL_OP_ADD = 0,

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