Last round of updates for net-next: * revert a patch that caused a regression with mesh userspace (Bob) * fix a number of suspend/resume related races (from Emmanuel, Luca and myself - we'll look at backporting later) * add software implementations for new ciphers (Jouni) * add a new ACPI ID for Broadcom's rfkill (Mika) * allow using netns FD for wireless (Vadim) * some other cleanups (various)
Showing the changes to include/uapi/linux (1 of 38 files). Show all
Unified · Split
| @@ -180,8 +180,8 @@ · 179 unmodified lines | ||
| 180 | 180 | * %NL80211_ATTR_WIPHY and %NL80211_ATTR_WIPHY_NAME. |
| 181 | 181 | * |
| 182 | 182 | * @NL80211_CMD_GET_INTERFACE: Request an interface's configuration; |
| 183 | − * either a dump request on a %NL80211_ATTR_WIPHY or a specific get | |
| 184 | − * on an %NL80211_ATTR_IFINDEX is supported. | |
| 183 | + * either a dump request for all interfaces or a specific get with a | |
| 184 | + * single %NL80211_ATTR_IFINDEX is supported. | |
| 185 | 185 | * @NL80211_CMD_SET_INTERFACE: Set type of a virtual interface, requires |
| 186 | 186 | * %NL80211_ATTR_IFINDEX and %NL80211_ATTR_IFTYPE. |
| 187 | 187 | * @NL80211_CMD_NEW_INTERFACE: Newly created virtual interface or response |
| @@ -324,7 +324,9 @@ · 136 unmodified lines | ||
| 324 | 324 | * if passed, define which channels should be scanned; if not |
| 325 | 325 | * passed, all channels allowed for the current regulatory domain |
| 326 | 326 | * are used. Extra IEs can also be passed from the userspace by |
| 327 | − * using the %NL80211_ATTR_IE attribute. | |
| 327 | + * using the %NL80211_ATTR_IE attribute. The first cycle of the | |
| 328 | + * scheduled scan can be delayed by %NL80211_ATTR_SCHED_SCAN_DELAY | |
| 329 | + * is supplied. | |
| 328 | 330 | * @NL80211_CMD_STOP_SCHED_SCAN: stop a scheduled scan. Returns -ENOENT if |
| 329 | 331 | * scheduled scan is not running. The caller may assume that as soon |
| 330 | 332 | * as the call returns, it is safe to start a new scheduled scan again. |
| @@ -1735,6 +1737,9 @@ enum nl80211_commands { · 1404 unmodified lines | ||
| 1735 | 1737 | * should be contained in the result as the sum of the respective counters |
| 1736 | 1738 | * over all channels. |
| 1737 | 1739 | * |
| 1740 | + * @NL80211_ATTR_SCHED_SCAN_DELAY: delay before a scheduled scan (or a | |
| 1741 | + * WoWLAN net-detect scan) is started, u32 in seconds. | |
| 1742 | + * | |
| 1738 | 1743 | * @NUM_NL80211_ATTR: total number of nl80211_attrs available |
| 1739 | 1744 | * @NL80211_ATTR_MAX: highest attribute number currently defined |
| 1740 | 1745 | * @__NL80211_ATTR_AFTER_LAST: internal use |
| @@ -2098,6 +2103,10 @@ enum nl80211_attrs { · 357 unmodified lines | ||
| 2098 | 2103 | |
| 2099 | 2104 | NL80211_ATTR_SURVEY_RADIO_STATS, |
| 2100 | 2105 | |
| 2106 | + NL80211_ATTR_NETNS_FD, | |
| 2107 | + | |
| 2108 | + NL80211_ATTR_SCHED_SCAN_DELAY, | |
| 2109 | + | |
| 2101 | 2110 | /* add attributes here, update the policy in nl80211.c */ |
| 2102 | 2111 | |
| 2103 | 2112 | __NL80211_ATTR_AFTER_LAST, |
| @@ -3741,11 +3750,12 @@ struct nl80211_pattern_support { · 1637 unmodified lines | ||
| 3741 | 3750 | * @NL80211_WOWLAN_TRIG_NET_DETECT: wake up when a configured network |
| 3742 | 3751 | * is detected. This is a nested attribute that contains the |
| 3743 | 3752 | * same attributes used with @NL80211_CMD_START_SCHED_SCAN. It |
| 3744 | − * specifies how the scan is performed (e.g. the interval and the | |
| 3745 | − * channels to scan) as well as the scan results that will | |
| 3746 | − * trigger a wake (i.e. the matchsets). This attribute is also | |
| 3747 | − * sent in a response to @NL80211_CMD_GET_WIPHY, indicating the | |
| 3748 | − * number of match sets supported by the driver (u32). | |
| 3753 | + * specifies how the scan is performed (e.g. the interval, the | |
| 3754 | + * channels to scan and the initial delay) as well as the scan | |
| 3755 | + * results that will trigger a wake (i.e. the matchsets). This | |
| 3756 | + * attribute is also sent in a response to | |
| 3757 | + * @NL80211_CMD_GET_WIPHY, indicating the number of match sets | |
| 3758 | + * supported by the driver (u32). | |
| 3749 | 3759 | * @NL80211_WOWLAN_TRIG_NET_DETECT_RESULTS: nested attribute |
| 3750 | 3760 | * containing an array with information about what triggered the |
| 3751 | 3761 | * wake up. If no elements are present in the array, it means |