History

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

Johannes Berg says: ==================== Three fixes: * fix a logic bug introduced by a previous cleanup * fix nl80211 attribute confusing (trying to use a single attribute for two purposes) * fix a long-standing BSS leak that happens when an association attempt is abandoned ====================

David S. Miller committed 9 years ago

Commit 5ac9efb2 parents 524a64c e6f462d7 files · +72 −12Browse files

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

Unified · Split

include/uapi/linux/nl80211.h+6−1
@@ -323,7 +323,7 @@ · 322 unmodified lines
323 * @NL80211_CMD_GET_SCAN: get scan results323 * @NL80211_CMD_GET_SCAN: get scan results
324 * @NL80211_CMD_TRIGGER_SCAN: trigger a new scan with the given parameters324 * @NL80211_CMD_TRIGGER_SCAN: trigger a new scan with the given parameters
325 * %NL80211_ATTR_TX_NO_CCK_RATE is used to decide whether to send the325 * %NL80211_ATTR_TX_NO_CCK_RATE is used to decide whether to send the
326 * probe requests at CCK rate or not. %NL80211_ATTR_MAC can be used to326 * probe requests at CCK rate or not. %NL80211_ATTR_BSSID can be used to
327 * specify a BSSID to scan for; if not included, the wildcard BSSID will327 * specify a BSSID to scan for; if not included, the wildcard BSSID will
328 * be used.328 * be used.
329 * @NL80211_CMD_NEW_SCAN_RESULTS: scan notification (as a reply to329 * @NL80211_CMD_NEW_SCAN_RESULTS: scan notification (as a reply to
@@ -1977,6 +1977,9 @@ enum nl80211_commands { · 1647 unmodified lines
1977 * @NL80211_ATTR_MULTICAST_TO_UNICAST_ENABLED: Indicates whether or not multicast1977 * @NL80211_ATTR_MULTICAST_TO_UNICAST_ENABLED: Indicates whether or not multicast
1978 * packets should be send out as unicast to all stations (flag attribute).1978 * packets should be send out as unicast to all stations (flag attribute).
1979 *1979 *
1980 * @NL80211_ATTR_BSSID: The BSSID of the AP. Note that %NL80211_ATTR_MAC is also
1981 * used in various commands/events for specifying the BSSID.
1982 *
1980 * @NUM_NL80211_ATTR: total number of nl80211_attrs available1983 * @NUM_NL80211_ATTR: total number of nl80211_attrs available
1981 * @NL80211_ATTR_MAX: highest attribute number currently defined1984 * @NL80211_ATTR_MAX: highest attribute number currently defined
1982 * @__NL80211_ATTR_AFTER_LAST: internal use1985 * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2381,6 +2384,8 @@ enum nl80211_attrs { · 398 unmodified lines
2381 2384
2382 NL80211_ATTR_MULTICAST_TO_UNICAST_ENABLED,2385 NL80211_ATTR_MULTICAST_TO_UNICAST_ENABLED,
2383 2386
2387 NL80211_ATTR_BSSID,
2388
2384 /* add attributes here, update the policy in nl80211.c */2389 /* add attributes here, update the policy in nl80211.c */
2385 2390
2386 __NL80211_ATTR_AFTER_LAST,2391 __NL80211_ATTR_AFTER_LAST,