cfg80211: restructure AP/GO mode API

The AP/GO mode API isn't very clearly defined, it
has "set beacon" and "new beacon" etc.

Modify the API to the following:
 * start AP -- all settings
 * change beacon -- new beacon data
 * stop AP -- stop AP mode operation

This also reflects in the nl80211 API, rename
the commands there correspondingly (but keep
the old names for compatibility.)

Overall, this makes it much clearer what's going
on in the API.

Kalle developed the ath6kl changes, I created
the rest of the patch.

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 40 insertions, 30 deletions

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index e0c9ff3a1977..755a7707a7c5 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -366,25 +366,13 @@ struct cfg80211_crypto_settings {
 };
 
 /**
- * struct beacon_parameters - beacon parameters
- *
- * Used to configure the beacon for an interface.
- *
+ * struct cfg80211_beacon_data - beacon data
  * @head: head portion of beacon (before TIM IE)
  *     or %NULL if not changed
  * @tail: tail portion of beacon (after TIM IE)
  *     or %NULL if not changed
- * @interval: beacon interval or zero if not changed
- * @dtim_period: DTIM period or zero if not changed
  * @head_len: length of @head
  * @tail_len: length of @tail
- * @ssid: SSID to be used in the BSS (note: may be %NULL if not provided from
- *      user space)
- * @ssid_len: length of @ssid
- * @hidden_ssid: whether to hide the SSID in Beacon/Probe Response frames
- * @crypto: crypto settings
- * @privacy: the BSS uses privacy
- * @auth_type: Authentication type (algorithm)
  * @beacon_ies: extra information element(s) to add into Beacon frames or %NULL
  * @beacon_ies_len: length of beacon_ies in octets
  * @proberesp_ies: extra information element(s) to add into Probe Response
@@ -396,24 +384,46 @@ struct cfg80211_crypto_settings {
  * @probe_resp_len: length of probe response template (@probe_resp)
  * @probe_resp: probe response template (AP mode only)
  */
-struct beacon_parameters {
-        u8 *head, *tail;
-        int interval, dtim_period;
-        int head_len, tail_len;
+struct cfg80211_beacon_data {
+        const u8 *head, *tail;
+        const u8 *beacon_ies;
+        const u8 *proberesp_ies;
+        const u8 *assocresp_ies;
+        const u8 *probe_resp;
+
+        size_t head_len, tail_len;
+        size_t beacon_ies_len;
+        size_t proberesp_ies_len;
+        size_t assocresp_ies_len;
+        size_t probe_resp_len;
+};
+
+/**
+ * struct cfg80211_ap_settings - AP configuration
+ *
+ * Used to configure an AP interface.
+ *
+ * @beacon: beacon data
+ * @beacon_interval: beacon interval
+ * @dtim_period: DTIM period
+ * @ssid: SSID to be used in the BSS (note: may be %NULL if not provided from
+ *      user space)
+ * @ssid_len: length of @ssid
+ * @hidden_ssid: whether to hide the SSID in Beacon/Probe Response frames
+ * @crypto: crypto settings
+ * @privacy: the BSS uses privacy
+ * @auth_type: Authentication type (algorithm)
+ */
+struct cfg80211_ap_settings {
+        struct cfg80211_beacon_data beacon;
+
+        int beacon_interval, dtim_period;
         const u8 *ssid;
         size_t ssid_len;
         enum nl80211_hidden_ssid hidden_ssid;
         struct cfg80211_crypto_settings crypto;
         bool privacy;
         enum nl80211_auth_type auth_type;
-        const u8 *beacon_ies;
-        size_t beacon_ies_len;
-        const u8 *proberesp_ies;
-        size_t proberesp_ies_len;
-        const u8 *assocresp_ies;
-        size_t assocresp_ies_len;
-        int probe_resp_len;
-        u8 *probe_resp;
 };
 
 /**
@@ -1518,11 +1528,11 @@ struct cfg80211_ops {
                                         struct net_device *netdev,
                                         u8 key_index);
 
-        int     (*add_beacon)(struct wiphy *wiphy, struct net_device *dev,
-                              struct beacon_parameters *info);
-        int     (*set_beacon)(struct wiphy *wiphy, struct net_device *dev,
-                              struct beacon_parameters *info);
-        int     (*del_beacon)(struct wiphy *wiphy, struct net_device *dev);
+        int     (*start_ap)(struct wiphy *wiphy, struct net_device *dev,
+                            struct cfg80211_ap_settings *settings);
+        int     (*change_beacon)(struct wiphy *wiphy, struct net_device *dev,
+                                 struct cfg80211_beacon_data *info);
+        int     (*stop_ap)(struct wiphy *wiphy, struct net_device *dev);
 
 
         int     (*add_station)(struct wiphy *wiphy, struct net_device *dev,