Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

1 files changed, 2 insertions, 0 deletions

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index a56bac1e69e..9c45b905aef 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -810,6 +810,7 @@ struct cfg80211_disassoc_request {
  * @beacon_interval: beacon interval to use
  * @privacy: this is a protected network, keys will be configured
  *      after joining
+ * @basic_rates: bitmap of basic rates to use when creating the IBSS
  */
 struct cfg80211_ibss_params {
         u8 *ssid;
@@ -818,6 +819,7 @@ struct cfg80211_ibss_params {
         u8 *ie;
         u8 ssid_len, ie_len;
         u16 beacon_interval;
+        u32 basic_rates;
         bool channel_fixed;
         bool privacy;
 };