diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2011-11-07 12:39:33 +0100 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2012-11-20 15:13:12 +0700 |
| commit | f6b7c50a14343eb8f6ae5fcc701c9b4b4df34f30 (patch) | |
| tree | 83d85309b36c9ca26762d59ab0047b02665f28fc /net/wireless | |
| parent | f43be6074288a8f37fde098c55583135ff21621c (diff) | |
| download | kernel_samsung_aries-f6b7c50a14343eb8f6ae5fcc701c9b4b4df34f30.zip kernel_samsung_aries-f6b7c50a14343eb8f6ae5fcc701c9b4b4df34f30.tar.gz kernel_samsung_aries-f6b7c50a14343eb8f6ae5fcc701c9b4b4df34f30.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 'net/wireless')
| -rw-r--r-- | net/wireless/core.c | 4 | ||||
| -rw-r--r-- | net/wireless/nl80211.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 112959d..8ba1553 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -492,6 +492,10 @@ int wiphy_register(struct wiphy *wiphy) !(wiphy->wowlan.flags & WIPHY_WOWLAN_SUPPORTS_GTK_REKEY))) return -EINVAL; + if (WARN_ON(wiphy->ap_sme_capa && + !(wiphy->flags & WIPHY_FLAG_HAVE_AP_SME))) + return -EINVAL; + if (WARN_ON(wiphy->addresses && !wiphy->n_addresses)) return -EINVAL; diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 0a78297..b346860 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -1002,6 +1002,10 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags, if (nl80211_put_iface_combinations(&dev->wiphy, msg)) goto nla_put_failure; + if (dev->wiphy.flags & WIPHY_FLAG_HAVE_AP_SME) + NLA_PUT_U32(msg, NL80211_ATTR_DEVICE_AP_SME, + dev->wiphy.ap_sme_capa); + return genlmsg_end(msg, hdr); nla_put_failure: |