diff options
author | David S. Miller <davem@davemloft.net> | 2009-12-04 16:25:15 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-04 16:25:15 -0500 |
commit | 8f56874bd7e8bee73ed6a1cf80dcec2753616262 (patch) | |
tree | aebd15dea662ef5efd89402b8fd92fec540a98eb /include/linux | |
parent | 47e1c323069bcef0acb8a2b48921688573f5ca63 (diff) | |
parent | 159bcfeb9123c91f0dc885a42b6387a98192f896 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/ieee80211.h | 2 | ||||
-rw-r--r-- | include/linux/nl80211.h | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index afa8e0ac27a7..d9724a28c0c2 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h | |||
@@ -1266,6 +1266,8 @@ enum ieee80211_sa_query_action { | |||
1266 | 1266 | ||
1267 | #define WLAN_MAX_KEY_LEN 32 | 1267 | #define WLAN_MAX_KEY_LEN 32 |
1268 | 1268 | ||
1269 | #define WLAN_PMKID_LEN 16 | ||
1270 | |||
1269 | /** | 1271 | /** |
1270 | * ieee80211_get_qos_ctl - get pointer to qos control bytes | 1272 | * ieee80211_get_qos_ctl - get pointer to qos control bytes |
1271 | * @hdr: the frame | 1273 | * @hdr: the frame |
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h index 45db17f81aa3..da8ea2e19273 100644 --- a/include/linux/nl80211.h +++ b/include/linux/nl80211.h | |||
@@ -349,6 +349,10 @@ enum nl80211_commands { | |||
349 | NL80211_CMD_GET_SURVEY, | 349 | NL80211_CMD_GET_SURVEY, |
350 | NL80211_CMD_NEW_SURVEY_RESULTS, | 350 | NL80211_CMD_NEW_SURVEY_RESULTS, |
351 | 351 | ||
352 | NL80211_CMD_SET_PMKSA, | ||
353 | NL80211_CMD_DEL_PMKSA, | ||
354 | NL80211_CMD_FLUSH_PMKSA, | ||
355 | |||
352 | /* add new commands above here */ | 356 | /* add new commands above here */ |
353 | 357 | ||
354 | /* used to define NL80211_CMD_MAX below */ | 358 | /* used to define NL80211_CMD_MAX below */ |
@@ -598,6 +602,10 @@ enum nl80211_commands { | |||
598 | * the survey response for %NL80211_CMD_GET_SURVEY, nested attribute | 602 | * the survey response for %NL80211_CMD_GET_SURVEY, nested attribute |
599 | * containing info as possible, see &enum survey_info. | 603 | * containing info as possible, see &enum survey_info. |
600 | * | 604 | * |
605 | * @NL80211_ATTR_PMKID: PMK material for PMKSA caching. | ||
606 | * @NL80211_ATTR_MAX_NUM_PMKIDS: maximum number of PMKIDs a firmware can | ||
607 | * cache, a wiphy attribute. | ||
608 | * | ||
601 | * @NL80211_ATTR_MAX: highest attribute number currently defined | 609 | * @NL80211_ATTR_MAX: highest attribute number currently defined |
602 | * @__NL80211_ATTR_AFTER_LAST: internal use | 610 | * @__NL80211_ATTR_AFTER_LAST: internal use |
603 | */ | 611 | */ |
@@ -732,6 +740,9 @@ enum nl80211_attrs { | |||
732 | 740 | ||
733 | NL80211_ATTR_SURVEY_INFO, | 741 | NL80211_ATTR_SURVEY_INFO, |
734 | 742 | ||
743 | NL80211_ATTR_PMKID, | ||
744 | NL80211_ATTR_MAX_NUM_PMKIDS, | ||
745 | |||
735 | /* add attributes here, update the policy in nl80211.c */ | 746 | /* add attributes here, update the policy in nl80211.c */ |
736 | 747 | ||
737 | __NL80211_ATTR_AFTER_LAST, | 748 | __NL80211_ATTR_AFTER_LAST, |