mac80211: Save probe response data for bss

Allow setting a probe response template for an interface operating in
AP mode. Low level drivers are notified about changes in the probe
response template and are able to retrieve a copy of the current probe
response. This data can, for example, be uploaded to hardware as a
template.

Signed-off-by: Guy Eilam <guy@wizery.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

5 files changed, 74 insertions, 5 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 192f213cf43e..c2416fbd1b27 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -491,6 +491,31 @@ static void ieee80211_config_ap_ssid(struct ieee80211_sub_if_data *sdata,
                 (params->hidden_ssid != NL80211_HIDDEN_SSID_NOT_IN_USE);
 }
 
+static int ieee80211_set_probe_resp(struct ieee80211_sub_if_data *sdata,
+                                    u8 *resp, size_t resp_len)
+{
+        struct sk_buff *new, *old;
+
+        if (!resp || !resp_len)
+                return -EINVAL;
+
+        old = sdata->u.ap.probe_resp;
+
+        new = dev_alloc_skb(resp_len);
+        if (!new)
+                return -ENOMEM;
+
+        memcpy(skb_put(new, resp_len), resp, resp_len);
+
+        rcu_assign_pointer(sdata->u.ap.probe_resp, new);
+        synchronize_rcu();
+
+        if (old)
+                dev_kfree_skb(old);
+
+        return 0;
+}
+
 /*
  * This handles both adding a beacon and setting new beacon info
  */
@@ -501,6 +526,7 @@ static int ieee80211_config_beacon(struct ieee80211_sub_if_data *sdata,
         int new_head_len, new_tail_len;
         int size;
         int err = -EINVAL;
+        u32 changed = 0;
 
         old = rtnl_dereference(sdata->u.ap.beacon);
 
@@ -584,11 +610,17 @@ static int ieee80211_config_beacon(struct ieee80211_sub_if_data *sdata,
 
         kfree(old);
 
+        err = ieee80211_set_probe_resp(sdata, params->probe_resp,
+                                       params->probe_resp_len);
+        if (!err)
+                changed |= BSS_CHANGED_AP_PROBE_RESP;
+
         ieee80211_config_ap_ssid(sdata, params);
+        changed |= BSS_CHANGED_BEACON_ENABLED |
+                   BSS_CHANGED_BEACON |
+                   BSS_CHANGED_SSID;
 
-        ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED |
-                                                BSS_CHANGED_BEACON |
-                                                BSS_CHANGED_SSID);
+        ieee80211_bss_info_change_notify(sdata, changed);
         return 0;
 }
 
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 873d681a8e52..068cc92d16aa 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -232,6 +232,7 @@ struct beacon_data {
 
 struct ieee80211_if_ap {
         struct beacon_data __rcu *beacon;
+        struct sk_buff __rcu *probe_resp;
 
         struct list_head vlans;
 
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 7b0c25bf8bbf..12a6d4bb5d37 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -462,15 +462,19 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
                 struct ieee80211_sub_if_data *vlan, *tmpsdata;
                 struct beacon_data *old_beacon =
                         rtnl_dereference(sdata->u.ap.beacon);
+                struct sk_buff *old_probe_resp =
+                        rtnl_dereference(sdata->u.ap.probe_resp);
 
                 /* sdata_running will return false, so this will disable */
                 ieee80211_bss_info_change_notify(sdata,
                                                  BSS_CHANGED_BEACON_ENABLED);
 
-                /* remove beacon */
+                /* remove beacon and probe response */
                 RCU_INIT_POINTER(sdata->u.ap.beacon, NULL);
+                RCU_INIT_POINTER(sdata->u.ap.probe_resp, NULL);
                 synchronize_rcu();
                 kfree(old_beacon);
+                kfree(old_probe_resp);
 
                 /* down all dependent devices, that is VLANs */
                 list_for_each_entry_safe(vlan, tmpsdata, &sdata->u.ap.vlans,
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index ab6cb56bc74d..2b413d38daa7 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -2415,6 +2415,37 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
 }
 EXPORT_SYMBOL(ieee80211_beacon_get_tim);
 
+struct sk_buff *ieee80211_proberesp_get(struct ieee80211_hw *hw,
+                                        struct ieee80211_vif *vif)
+{
+        struct ieee80211_if_ap *ap = NULL;
+        struct sk_buff *presp = NULL, *skb = NULL;
+        struct ieee80211_hdr *hdr;
+        struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
+
+        if (sdata->vif.type != NL80211_IFTYPE_AP)
+                return NULL;
+
+        rcu_read_lock();
+
+        ap = &sdata->u.ap;
+        presp = rcu_dereference(ap->probe_resp);
+        if (!presp)
+                goto out;
+
+        skb = skb_copy(presp, GFP_ATOMIC);
+        if (!skb)
+                goto out;
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        memset(hdr->addr1, 0, sizeof(hdr->addr1));
+
+out:
+        rcu_read_unlock();
+        return skb;
+}
+EXPORT_SYMBOL(ieee80211_proberesp_get);
+
 struct sk_buff *ieee80211_pspoll_get(struct ieee80211_hw *hw,
                                      struct ieee80211_vif *vif)
 {
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 6ed0aa430789..4cf25b0eea74 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1071,7 +1071,8 @@ int ieee80211_reconfig(struct ieee80211_local *local)
                         changed |= BSS_CHANGED_IBSS;
                         /* fall through */
                 case NL80211_IFTYPE_AP:
-                        changed |= BSS_CHANGED_SSID;
+                        changed |= BSS_CHANGED_SSID |
+                                   BSS_CHANGED_AP_PROBE_RESP;
                         /* fall through */
                 case NL80211_IFTYPE_MESH_POINT:
                         changed |= BSS_CHANGED_BEACON |