git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
include
/
net
/
cfg80211.h
diff --git
a/include/net/cfg80211.h
b/include/net/cfg80211.h
index
a56bac1
..
9c45b90
100644
(file)
--- 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
* @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;
*/
struct cfg80211_ibss_params {
u8 *ssid;
@@
-818,6
+819,7
@@
struct cfg80211_ibss_params {
u8 *ie;
u8 ssid_len, ie_len;
u16 beacon_interval;
u8 *ie;
u8 ssid_len, ie_len;
u16 beacon_interval;
+ u32 basic_rates;
bool channel_fixed;
bool privacy;
};
bool channel_fixed;
bool privacy;
};