Johannes Berg says: ==================== To synchronize with Kalle, here's just a big change that affects all drivers - removing the duplicated enum ieee80211_band and replacing it by enum nl80211_band. On top of that, just a small documentation update. ====================
Showing the changes to include/uapi (1 of 230 files). Show all
Unified · Split
| @@ -429,7 +429,11 @@ · 428 unmodified lines | |||
| 429 | * @NL80211_CMD_ASSOCIATE: association request and notification; like | 429 | * @NL80211_CMD_ASSOCIATE: association request and notification; like |
| 430 | * NL80211_CMD_AUTHENTICATE but for Association and Reassociation | 430 | * NL80211_CMD_AUTHENTICATE but for Association and Reassociation |
| 431 | * (similar to MLME-ASSOCIATE.request, MLME-REASSOCIATE.request, | 431 | * (similar to MLME-ASSOCIATE.request, MLME-REASSOCIATE.request, |
| 432 | * MLME-ASSOCIATE.confirm or MLME-REASSOCIATE.confirm primitives). | 432 | * MLME-ASSOCIATE.confirm or MLME-REASSOCIATE.confirm primitives). The |
| 433 | * %NL80211_ATTR_PREV_BSSID attribute is used to specify whether the | ||
| 434 | * request is for the initial association to an ESS (that attribute not | ||
| 435 | * included) or for reassociation within the ESS (that attribute is | ||
| 436 | * included). | ||
| 433 | * @NL80211_CMD_DEAUTHENTICATE: deauthentication request and notification; like | 437 | * @NL80211_CMD_DEAUTHENTICATE: deauthentication request and notification; like |
| 434 | * NL80211_CMD_AUTHENTICATE but for Deauthentication frames (similar to | 438 | * NL80211_CMD_AUTHENTICATE but for Deauthentication frames (similar to |
| 435 | * MLME-DEAUTHENTICATION.request and MLME-DEAUTHENTICATE.indication | 439 | * MLME-DEAUTHENTICATION.request and MLME-DEAUTHENTICATE.indication |
| @@ -479,6 +483,9 @@ · 43 unmodified lines | |||
| 479 | * set of BSSID,frequency parameters is used (i.e., either the enforcing | 483 | * set of BSSID,frequency parameters is used (i.e., either the enforcing |
| 480 | * %NL80211_ATTR_MAC,%NL80211_ATTR_WIPHY_FREQ or the less strict | 484 | * %NL80211_ATTR_MAC,%NL80211_ATTR_WIPHY_FREQ or the less strict |
| 481 | * %NL80211_ATTR_MAC_HINT and %NL80211_ATTR_WIPHY_FREQ_HINT). | 485 | * %NL80211_ATTR_MAC_HINT and %NL80211_ATTR_WIPHY_FREQ_HINT). |
| 486 | * %NL80211_ATTR_PREV_BSSID can be used to request a reassociation within | ||
| 487 | * the ESS in case the device is already associated and an association with | ||
| 488 | * a different BSS is desired. | ||
| 482 | * Background scan period can optionally be | 489 | * Background scan period can optionally be |
| 483 | * specified in %NL80211_ATTR_BG_SCAN_PERIOD, | 490 | * specified in %NL80211_ATTR_BG_SCAN_PERIOD, |
| 484 | * if not specified default background scan configuration | 491 | * if not specified default background scan configuration |
| @@ -1287,8 +1294,11 @@ enum nl80211_commands { · 802 unmodified lines | |||
| 1287 | * @NL80211_ATTR_RESP_IE: (Re)association response information elements as | 1294 | * @NL80211_ATTR_RESP_IE: (Re)association response information elements as |
| 1288 | * sent by peer, for ROAM and successful CONNECT events. | 1295 | * sent by peer, for ROAM and successful CONNECT events. |
| 1289 | * | 1296 | * |
| 1290 | * @NL80211_ATTR_PREV_BSSID: previous BSSID, to be used by in ASSOCIATE | 1297 | * @NL80211_ATTR_PREV_BSSID: previous BSSID, to be used in ASSOCIATE and CONNECT |
| 1291 | * commands to specify using a reassociate frame | 1298 | * commands to specify a request to reassociate within an ESS, i.e., to use |
| 1299 | * Reassociate Request frame (with the value of this attribute in the | ||
| 1300 | * Current AP address field) instead of Association Request frame which is | ||
| 1301 | * used for the initial association to an ESS. | ||
| 1292 | * | 1302 | * |
| 1293 | * @NL80211_ATTR_KEY: key information in a nested attribute with | 1303 | * @NL80211_ATTR_KEY: key information in a nested attribute with |
| 1294 | * %NL80211_KEY_* sub-attributes | 1304 | * %NL80211_KEY_* sub-attributes |
| @@ -3643,11 +3653,15 @@ enum nl80211_txrate_gi { · 2348 unmodified lines | |||
| 3643 | * @NL80211_BAND_2GHZ: 2.4 GHz ISM band | 3653 | * @NL80211_BAND_2GHZ: 2.4 GHz ISM band |
| 3644 | * @NL80211_BAND_5GHZ: around 5 GHz band (4.9 - 5.7 GHz) | 3654 | * @NL80211_BAND_5GHZ: around 5 GHz band (4.9 - 5.7 GHz) |
| 3645 | * @NL80211_BAND_60GHZ: around 60 GHz band (58.32 - 64.80 GHz) | 3655 | * @NL80211_BAND_60GHZ: around 60 GHz band (58.32 - 64.80 GHz) |
| 3656 | * @NUM_NL80211_BANDS: number of bands, avoid using this in userspace | ||
| 3657 | * since newer kernel versions may support more bands | ||
| 3646 | */ | 3658 | */ |
| 3647 | enum nl80211_band { | 3659 | enum nl80211_band { |
| 3648 | NL80211_BAND_2GHZ, | 3660 | NL80211_BAND_2GHZ, |
| 3649 | NL80211_BAND_5GHZ, | 3661 | NL80211_BAND_5GHZ, |
| 3650 | NL80211_BAND_60GHZ, | 3662 | NL80211_BAND_60GHZ, |
| 3663 | |||
| 3664 | NUM_NL80211_BANDS, | ||
| 3651 | }; | 3665 | }; |
| 3652 | 3666 | ||
| 3653 | /** | 3667 | /** |