aboutsummaryrefslogtreecommitdiff
path: root/include/net/wireless.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-02-14 23:06:44 -0800
committerDavid S. Miller <davem@davemloft.net>2009-02-14 23:06:44 -0800
commitac178ef0ae9eb44fd527d87aa9b6394e05f56e1f (patch)
tree5d6bd46ecf9ce989134d3c460e1ecf5dd1fceadc /include/net/wireless.h
parentf3a7c66b5ce0b75a9774a50b5dcce93e5ba28370 (diff)
parent6d08b9b9c6eb2414c4a037407dd121298a74fb36 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'include/net/wireless.h')
-rw-r--r--include/net/wireless.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/wireless.h b/include/net/wireless.h
index a42c1562d52..1c6285eb166 100644
--- a/include/net/wireless.h
+++ b/include/net/wireless.h
@@ -213,6 +213,9 @@ struct wiphy {
bool custom_regulatory;
bool strict_regulatory;
+ int bss_priv_size;
+ u8 max_scan_ssids;
+
/* If multiple wiphys are registered and you're handed e.g.
* a regular netdev with assigned ieee80211_ptr, you won't
* know whether it points to a wiphy your driver has registered