diff options
author | David S. Miller <davem@davemloft.net> | 2009-07-26 13:01:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-26 13:01:25 -0400 |
commit | c8b201ff867e64b6233d069563081775269f4499 (patch) | |
tree | 35d363e6cb565fd7285480dc877a2da79eafb9a7 /include/linux/nl80211.h | |
parent | 436b355b96042ab6564f43a7dabd5c61d9634ff7 (diff) | |
parent | 249b405cf8145da8a74b70544ae1079d244bdb00 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'include/linux/nl80211.h')
-rw-r--r-- | include/linux/nl80211.h | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h index e496a2daf7ef..962e2232a074 100644 --- a/include/linux/nl80211.h +++ b/include/linux/nl80211.h | |||
@@ -567,6 +567,12 @@ enum nl80211_commands { | |||
567 | * @NL80211_ATTR_PREV_BSSID: previous BSSID, to be used by in ASSOCIATE | 567 | * @NL80211_ATTR_PREV_BSSID: previous BSSID, to be used by in ASSOCIATE |
568 | * commands to specify using a reassociate frame | 568 | * commands to specify using a reassociate frame |
569 | * | 569 | * |
570 | * @NL80211_ATTR_KEY: key information in a nested attribute with | ||
571 | * %NL80211_KEY_* sub-attributes | ||
572 | * @NL80211_ATTR_KEYS: array of keys for static WEP keys for connect() | ||
573 | * and join_ibss(), key information is in a nested attribute each | ||
574 | * with %NL80211_KEY_* sub-attributes | ||
575 | * | ||
570 | * @NL80211_ATTR_MAX: highest attribute number currently defined | 576 | * @NL80211_ATTR_MAX: highest attribute number currently defined |
571 | * @__NL80211_ATTR_AFTER_LAST: internal use | 577 | * @__NL80211_ATTR_AFTER_LAST: internal use |
572 | */ | 578 | */ |
@@ -692,6 +698,9 @@ enum nl80211_attrs { | |||
692 | 698 | ||
693 | NL80211_ATTR_PREV_BSSID, | 699 | NL80211_ATTR_PREV_BSSID, |
694 | 700 | ||
701 | NL80211_ATTR_KEY, | ||
702 | NL80211_ATTR_KEYS, | ||
703 | |||
695 | /* add attributes here, update the policy in nl80211.c */ | 704 | /* add attributes here, update the policy in nl80211.c */ |
696 | 705 | ||
697 | __NL80211_ATTR_AFTER_LAST, | 706 | __NL80211_ATTR_AFTER_LAST, |
@@ -720,6 +729,8 @@ enum nl80211_attrs { | |||
720 | #define NL80211_ATTR_CIPHER_SUITE_GROUP NL80211_ATTR_CIPHER_SUITE_GROUP | 729 | #define NL80211_ATTR_CIPHER_SUITE_GROUP NL80211_ATTR_CIPHER_SUITE_GROUP |
721 | #define NL80211_ATTR_WPA_VERSIONS NL80211_ATTR_WPA_VERSIONS | 730 | #define NL80211_ATTR_WPA_VERSIONS NL80211_ATTR_WPA_VERSIONS |
722 | #define NL80211_ATTR_AKM_SUITES NL80211_ATTR_AKM_SUITES | 731 | #define NL80211_ATTR_AKM_SUITES NL80211_ATTR_AKM_SUITES |
732 | #define NL80211_ATTR_KEY NL80211_ATTR_KEY | ||
733 | #define NL80211_ATTR_KEYS NL80211_ATTR_KEYS | ||
723 | 734 | ||
724 | #define NL80211_MAX_SUPP_RATES 32 | 735 | #define NL80211_MAX_SUPP_RATES 32 |
725 | #define NL80211_MAX_SUPP_REG_RULES 32 | 736 | #define NL80211_MAX_SUPP_REG_RULES 32 |
@@ -1249,6 +1260,7 @@ enum nl80211_channel_type { | |||
1249 | * in mBm (100 * dBm) (s32) | 1260 | * in mBm (100 * dBm) (s32) |
1250 | * @NL80211_BSS_SIGNAL_UNSPEC: signal strength of the probe response/beacon | 1261 | * @NL80211_BSS_SIGNAL_UNSPEC: signal strength of the probe response/beacon |
1251 | * in unspecified units, scaled to 0..100 (u8) | 1262 | * in unspecified units, scaled to 0..100 (u8) |
1263 | * @NL80211_BSS_STATUS: status, if this BSS is "used" | ||
1252 | * @__NL80211_BSS_AFTER_LAST: internal | 1264 | * @__NL80211_BSS_AFTER_LAST: internal |
1253 | * @NL80211_BSS_MAX: highest BSS attribute | 1265 | * @NL80211_BSS_MAX: highest BSS attribute |
1254 | */ | 1266 | */ |
@@ -1262,6 +1274,7 @@ enum nl80211_bss { | |||
1262 | NL80211_BSS_INFORMATION_ELEMENTS, | 1274 | NL80211_BSS_INFORMATION_ELEMENTS, |
1263 | NL80211_BSS_SIGNAL_MBM, | 1275 | NL80211_BSS_SIGNAL_MBM, |
1264 | NL80211_BSS_SIGNAL_UNSPEC, | 1276 | NL80211_BSS_SIGNAL_UNSPEC, |
1277 | NL80211_BSS_STATUS, | ||
1265 | 1278 | ||
1266 | /* keep last */ | 1279 | /* keep last */ |
1267 | __NL80211_BSS_AFTER_LAST, | 1280 | __NL80211_BSS_AFTER_LAST, |
@@ -1269,6 +1282,15 @@ enum nl80211_bss { | |||
1269 | }; | 1282 | }; |
1270 | 1283 | ||
1271 | /** | 1284 | /** |
1285 | * enum nl80211_bss_status - BSS "status" | ||
1286 | */ | ||
1287 | enum nl80211_bss_status { | ||
1288 | NL80211_BSS_STATUS_AUTHENTICATED, | ||
1289 | NL80211_BSS_STATUS_ASSOCIATED, | ||
1290 | NL80211_BSS_STATUS_IBSS_JOINED, | ||
1291 | }; | ||
1292 | |||
1293 | /** | ||
1272 | * enum nl80211_auth_type - AuthenticationType | 1294 | * enum nl80211_auth_type - AuthenticationType |
1273 | * | 1295 | * |
1274 | * @NL80211_AUTHTYPE_OPEN_SYSTEM: Open System authentication | 1296 | * @NL80211_AUTHTYPE_OPEN_SYSTEM: Open System authentication |
@@ -1320,4 +1342,34 @@ enum nl80211_wpa_versions { | |||
1320 | NL80211_WPA_VERSION_2 = 1 << 1, | 1342 | NL80211_WPA_VERSION_2 = 1 << 1, |
1321 | }; | 1343 | }; |
1322 | 1344 | ||
1345 | /** | ||
1346 | * enum nl80211_key_attributes - key attributes | ||
1347 | * @__NL80211_KEY_INVALID: invalid | ||
1348 | * @NL80211_KEY_DATA: (temporal) key data; for TKIP this consists of | ||
1349 | * 16 bytes encryption key followed by 8 bytes each for TX and RX MIC | ||
1350 | * keys | ||
1351 | * @NL80211_KEY_IDX: key ID (u8, 0-3) | ||
1352 | * @NL80211_KEY_CIPHER: key cipher suite (u32, as defined by IEEE 802.11 | ||
1353 | * section 7.3.2.25.1, e.g. 0x000FAC04) | ||
1354 | * @NL80211_KEY_SEQ: transmit key sequence number (IV/PN) for TKIP and | ||
1355 | * CCMP keys, each six bytes in little endian | ||
1356 | * @NL80211_KEY_DEFAULT: flag indicating default key | ||
1357 | * @NL80211_KEY_DEFAULT_MGMT: flag indicating default management key | ||
1358 | * @__NL80211_KEY_AFTER_LAST: internal | ||
1359 | * @NL80211_KEY_MAX: highest key attribute | ||
1360 | */ | ||
1361 | enum nl80211_key_attributes { | ||
1362 | __NL80211_KEY_INVALID, | ||
1363 | NL80211_KEY_DATA, | ||
1364 | NL80211_KEY_IDX, | ||
1365 | NL80211_KEY_CIPHER, | ||
1366 | NL80211_KEY_SEQ, | ||
1367 | NL80211_KEY_DEFAULT, | ||
1368 | NL80211_KEY_DEFAULT_MGMT, | ||
1369 | |||
1370 | /* keep last */ | ||
1371 | __NL80211_KEY_AFTER_LAST, | ||
1372 | NL80211_KEY_MAX = __NL80211_KEY_AFTER_LAST - 1 | ||
1373 | }; | ||
1374 | |||
1323 | #endif /* __LINUX_NL80211_H */ | 1375 | #endif /* __LINUX_NL80211_H */ |