nl80211: allow configuring IBSS beacon interval

Make the JOIN_IBSS command look at the beacon interval
attribute to see if the user requested a specific beacon
interval, if not default to 100 TU (wext too).

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 5 insertions, 1 deletions

diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index dc9d9ec5d1ae..b6a48dd502ce 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -230,7 +230,9 @@
  *      and optionally a MAC (as BSSID) and FREQ_FIXED attribute if those
  *      should be fixed rather than automatically determined. Can only be
  *      executed on a network interface that is UP, and fixed BSSID/FREQ
- *      may be rejected.
+ *      may be rejected. Another optional parameter is the beacon interval,
+ *      given in the %NL80211_ATTR_BEACON_INTERVAL attribute, which if not
+ *      given defaults to 100 TU (102.4ms).
  * @NL80211_CMD_LEAVE_IBSS: Leave the IBSS -- no special arguments, the IBSS is
  *      determined by the network interface.
  *
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 54bc69c83691..7f7b53b69cb2 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -733,6 +733,7 @@ struct cfg80211_disassoc_request {
  *      IBSSs to join on other channels.
  * @ie: information element(s) to include in the beacon
  * @ie_len: length of that
+ * @beacon_interval: beacon interval to use
  */
 struct cfg80211_ibss_params {
         u8 *ssid;
@@ -740,6 +741,7 @@ struct cfg80211_ibss_params {
         struct ieee80211_channel *channel;
         u8 *ie;
         u8 ssid_len, ie_len;
+        u16 beacon_interval;
         bool channel_fixed;
 };