aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-11-07 06:39:33 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-11-09 16:12:38 -0500
commit562a74803f4881772ba2375ec4e5aa0ad90f4caa (patch)
tree2f6e553b4bf17e410c4d4c16cd8388820e7f9b63 /net/wireless
parent21fc756087d7659d86c344c0b38229313afc6c7c (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 'net/wireless')
-rw-r--r--net/wireless/core.c4
-rw-r--r--net/wireless/nl80211.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 220f3bd176f8..ccdfed897651 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -492,6 +492,10 @@ int wiphy_register(struct wiphy *wiphy)
492 !(wiphy->wowlan.flags & WIPHY_WOWLAN_SUPPORTS_GTK_REKEY))) 492 !(wiphy->wowlan.flags & WIPHY_WOWLAN_SUPPORTS_GTK_REKEY)))
493 return -EINVAL; 493 return -EINVAL;
494 494
495 if (WARN_ON(wiphy->ap_sme_capa &&
496 !(wiphy->flags & WIPHY_FLAG_HAVE_AP_SME)))
497 return -EINVAL;
498
495 if (WARN_ON(wiphy->addresses && !wiphy->n_addresses)) 499 if (WARN_ON(wiphy->addresses && !wiphy->n_addresses))
496 return -EINVAL; 500 return -EINVAL;
497 501
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 9910c3cb9a85..2094c8468d78 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -1007,6 +1007,10 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
1007 if (nl80211_put_iface_combinations(&dev->wiphy, msg)) 1007 if (nl80211_put_iface_combinations(&dev->wiphy, msg))
1008 goto nla_put_failure; 1008 goto nla_put_failure;
1009 1009
1010 if (dev->wiphy.flags & WIPHY_FLAG_HAVE_AP_SME)
1011 NLA_PUT_U32(msg, NL80211_ATTR_DEVICE_AP_SME,
1012 dev->wiphy.ap_sme_capa);
1013
1010 return genlmsg_end(msg, hdr); 1014 return genlmsg_end(msg, hdr);
1011 1015
1012 nla_put_failure: 1016 nla_put_failure: