diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2011-11-07 12:39:33 +0100 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2012-08-24 13:55:43 -0700 |
| commit | 6c3e830bd84af1b8e125490dc194fe099490dc46 (patch) | |
| tree | 55525c1135503c5983899c9aa2e31491ebd840fa /include | |
| parent | 1bd42d5ea786795ee253847e03e0ab617f41739d (diff) | |
| download | kernel_samsung_crespo-6c3e830bd84af1b8e125490dc194fe099490dc46.zip kernel_samsung_crespo-6c3e830bd84af1b8e125490dc194fe099490dc46.tar.gz kernel_samsung_crespo-6c3e830bd84af1b8e125490dc194fe099490dc46.tar.bz2 | |
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>
Conflicts:
drivers/net/wireless/ath/ath6kl/init.c
Change-Id: Ib1a65814860cf97cadd142c17be0e91f43743832
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 e077580..8cc5987 100644 --- a/include/linux/nl80211.h +++ b/include/linux/nl80211.h @@ -1095,6 +1095,11 @@ enum nl80211_commands { * %NL80211_CMD_TDLS_MGMT. Otherwise %NL80211_CMD_TDLS_OPER should be * used for asking the driver to perform a TDLS operation. * + * @NL80211_ATTR_DEVICE_AP_SME: This u32 attribute may be listed for devices + * that have AP support to indicate that they have the AP SME integrated + * with support for the features listed in this attribute, see + * &enum nl80211_ap_sme_features. + * * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use */ @@ -1323,6 +1328,8 @@ enum nl80211_attrs { NL80211_ATTR_TDLS_SUPPORT, NL80211_ATTR_TDLS_EXTERNAL_SETUP, + NL80211_ATTR_DEVICE_AP_SME, + /* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST, @@ -2623,4 +2630,12 @@ enum nl80211_tdls_operation { NL80211_TDLS_DISABLE_LINK, }; +/* + * enum nl80211_ap_sme_features - device-integrated AP features + * Reserved for future use, no bits are defined in + * NL80211_ATTR_DEVICE_AP_SME yet. +enum nl80211_ap_sme_features { +}; + */ + #endif /* __LINUX_NL80211_H */ diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 7c206b6..b258e5c 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -1611,6 +1611,7 @@ struct cfg80211_ops { * teardown packets should be sent through the @NL80211_CMD_TDLS_MGMT * command. When this flag is not set, @NL80211_CMD_TDLS_OPER should be * used for asking the driver/firmware to perform a TDLS operation. + * @WIPHY_FLAG_HAVE_AP_SME: device integrates AP SME */ enum wiphy_flags { WIPHY_FLAG_CUSTOM_REGULATORY = BIT(0), @@ -1629,6 +1630,7 @@ enum wiphy_flags { WIPHY_FLAG_AP_UAPSD = BIT(14), WIPHY_FLAG_SUPPORTS_TDLS = BIT(15), WIPHY_FLAG_TDLS_EXTERNAL_SETUP = BIT(16), + WIPHY_FLAG_HAVE_AP_SME = BIT(17), }; /** @@ -1836,6 +1838,8 @@ struct wiphy_wowlan_support { * may request, if implemented. * * @wowlan: WoWLAN support information + * + * @ap_sme_capa: AP SME capabilities, flags from &enum nl80211_ap_sme_features. */ struct wiphy { /* assign these fields before you register the wiphy */ @@ -1859,6 +1863,8 @@ struct wiphy { u32 flags; + u32 ap_sme_capa; + enum cfg80211_signal_type signal_type; int bss_priv_size; |