diff options
author | Johannes Berg <johannes.berg@intel.com> | 2011-11-07 06:39:33 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-11-09 16:12:38 -0500 |
commit | 562a74803f4881772ba2375ec4e5aa0ad90f4caa (patch) | |
tree | 2f6e553b4bf17e410c4d4c16cd8388820e7f9b63 /include | |
parent | 21fc756087d7659d86c344c0b38229313afc6c7c (diff) |
nl80211: advertise device AP SME
Add the ability to advertise that the device
contains the AP SME and what features it can
support. There are currently no features in
the bitmap -- probe response offload will be
advertised by a few patches Arik is working
on now (who took over from Guy Eilam) and a
device with AP SME will typically implement
and require response offload.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/nl80211.h | 15 | ||||
-rw-r--r-- | include/net/cfg80211.h | 6 |
2 files changed, 21 insertions, 0 deletions
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h index 9107adc73e0b..ff39e4b234d4 100644 --- a/include/linux/nl80211.h +++ b/include/linux/nl80211.h | |||
@@ -1121,6 +1121,11 @@ enum nl80211_commands { | |||
1121 | * %NL80211_CMD_TDLS_MGMT. Otherwise %NL80211_CMD_TDLS_OPER should be | 1121 | * %NL80211_CMD_TDLS_MGMT. Otherwise %NL80211_CMD_TDLS_OPER should be |
1122 | * used for asking the driver to perform a TDLS operation. | 1122 | * used for asking the driver to perform a TDLS operation. |
1123 | * | 1123 | * |
1124 | * @NL80211_ATTR_DEVICE_AP_SME: This u32 attribute may be listed for devices | ||
1125 | * that have AP support to indicate that they have the AP SME integrated | ||
1126 | * with support for the features listed in this attribute, see | ||
1127 | * &enum nl80211_ap_sme_features. | ||
1128 | * | ||
1124 | * @NL80211_ATTR_MAX: highest attribute number currently defined | 1129 | * @NL80211_ATTR_MAX: highest attribute number currently defined |
1125 | * @__NL80211_ATTR_AFTER_LAST: internal use | 1130 | * @__NL80211_ATTR_AFTER_LAST: internal use |
1126 | */ | 1131 | */ |
@@ -1349,6 +1354,8 @@ enum nl80211_attrs { | |||
1349 | NL80211_ATTR_TDLS_SUPPORT, | 1354 | NL80211_ATTR_TDLS_SUPPORT, |
1350 | NL80211_ATTR_TDLS_EXTERNAL_SETUP, | 1355 | NL80211_ATTR_TDLS_EXTERNAL_SETUP, |
1351 | 1356 | ||
1357 | NL80211_ATTR_DEVICE_AP_SME, | ||
1358 | |||
1352 | /* add attributes here, update the policy in nl80211.c */ | 1359 | /* add attributes here, update the policy in nl80211.c */ |
1353 | 1360 | ||
1354 | __NL80211_ATTR_AFTER_LAST, | 1361 | __NL80211_ATTR_AFTER_LAST, |
@@ -2662,4 +2669,12 @@ enum nl80211_tdls_operation { | |||
2662 | NL80211_TDLS_DISABLE_LINK, | 2669 | NL80211_TDLS_DISABLE_LINK, |
2663 | }; | 2670 | }; |
2664 | 2671 | ||
2672 | /* | ||
2673 | * enum nl80211_ap_sme_features - device-integrated AP features | ||
2674 | * Reserved for future use, no bits are defined in | ||
2675 | * NL80211_ATTR_DEVICE_AP_SME yet. | ||
2676 | enum nl80211_ap_sme_features { | ||
2677 | }; | ||
2678 | */ | ||
2679 | |||
2665 | #endif /* __LINUX_NL80211_H */ | 2680 | #endif /* __LINUX_NL80211_H */ |
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index ef118e452589..86d207da6cce 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
@@ -1679,6 +1679,7 @@ struct cfg80211_ops { | |||
1679 | * teardown packets should be sent through the @NL80211_CMD_TDLS_MGMT | 1679 | * teardown packets should be sent through the @NL80211_CMD_TDLS_MGMT |
1680 | * command. When this flag is not set, @NL80211_CMD_TDLS_OPER should be | 1680 | * command. When this flag is not set, @NL80211_CMD_TDLS_OPER should be |
1681 | * used for asking the driver/firmware to perform a TDLS operation. | 1681 | * used for asking the driver/firmware to perform a TDLS operation. |
1682 | * @WIPHY_FLAG_HAVE_AP_SME: device integrates AP SME | ||
1682 | */ | 1683 | */ |
1683 | enum wiphy_flags { | 1684 | enum wiphy_flags { |
1684 | WIPHY_FLAG_CUSTOM_REGULATORY = BIT(0), | 1685 | WIPHY_FLAG_CUSTOM_REGULATORY = BIT(0), |
@@ -1697,6 +1698,7 @@ enum wiphy_flags { | |||
1697 | WIPHY_FLAG_AP_UAPSD = BIT(14), | 1698 | WIPHY_FLAG_AP_UAPSD = BIT(14), |
1698 | WIPHY_FLAG_SUPPORTS_TDLS = BIT(15), | 1699 | WIPHY_FLAG_SUPPORTS_TDLS = BIT(15), |
1699 | WIPHY_FLAG_TDLS_EXTERNAL_SETUP = BIT(16), | 1700 | WIPHY_FLAG_TDLS_EXTERNAL_SETUP = BIT(16), |
1701 | WIPHY_FLAG_HAVE_AP_SME = BIT(17), | ||
1700 | }; | 1702 | }; |
1701 | 1703 | ||
1702 | /** | 1704 | /** |
@@ -1907,6 +1909,8 @@ struct wiphy_wowlan_support { | |||
1907 | * may request, if implemented. | 1909 | * may request, if implemented. |
1908 | * | 1910 | * |
1909 | * @wowlan: WoWLAN support information | 1911 | * @wowlan: WoWLAN support information |
1912 | * | ||
1913 | * @ap_sme_capa: AP SME capabilities, flags from &enum nl80211_ap_sme_features. | ||
1910 | */ | 1914 | */ |
1911 | struct wiphy { | 1915 | struct wiphy { |
1912 | /* assign these fields before you register the wiphy */ | 1916 | /* assign these fields before you register the wiphy */ |
@@ -1930,6 +1934,8 @@ struct wiphy { | |||
1930 | 1934 | ||
1931 | u32 flags; | 1935 | u32 flags; |
1932 | 1936 | ||
1937 | u32 ap_sme_capa; | ||
1938 | |||
1933 | enum cfg80211_signal_type signal_type; | 1939 | enum cfg80211_signal_type signal_type; |
1934 | 1940 | ||
1935 | int bss_priv_size; | 1941 | int bss_priv_size; |