summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ipw2x00/libipw.h
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2009-08-25 14:12:25 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-08-28 14:40:46 -0400
commitb8ecd988b1670035a05035c553c08331214d6603 (patch)
tree4a6eda87b8b9d8aab7658cfd6f553dc9c86a13be /drivers/net/wireless/ipw2x00/libipw.h
parent73f57f8398ed6cba82f9856e20d94d71e6edb3e2 (diff)
downloadop-kernel-dev-b8ecd988b1670035a05035c553c08331214d6603.zip
op-kernel-dev-b8ecd988b1670035a05035c553c08331214d6603.tar.gz
libipw: initiate cfg80211 API conversion
Initiate the conversion of libipw to the new cfg80211 configuration API. For now, leave CONFIG_IPW2200_PROMISCUOUS stuff alone. Eventually migrate it to cfg80211 when the add/del/change_virtual_intf methods are implemented. Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ipw2x00/libipw.h')
-rw-r--r--drivers/net/wireless/ipw2x00/libipw.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/wireless/ipw2x00/libipw.h b/drivers/net/wireless/ipw2x00/libipw.h
index cefb942..8f91d34 100644
--- a/drivers/net/wireless/ipw2x00/libipw.h
+++ b/drivers/net/wireless/ipw2x00/libipw.h
@@ -31,6 +31,7 @@
#include <linux/ieee80211.h>
#include <net/lib80211.h>
+#include <net/cfg80211.h>
#define LIBIPW_VERSION "git-1.1.13"
@@ -783,12 +784,15 @@ struct libipw_geo {
struct libipw_device {
struct net_device *dev;
+ struct wireless_dev wdev;
struct libipw_security sec;
/* Bookkeeping structures */
struct libipw_stats ieee_stats;
struct libipw_geo geo;
+ struct ieee80211_supported_band bg_band;
+ struct ieee80211_supported_band a_band;
/* Probe / Beacon management */
struct list_head network_free_list;
@@ -1014,8 +1018,8 @@ static inline int libipw_is_cck_rate(u8 rate)
}
/* ieee80211.c */
-extern void free_ieee80211(struct net_device *dev);
-extern struct net_device *alloc_ieee80211(int sizeof_priv);
+extern void free_ieee80211(struct net_device *dev, int monitor);
+extern struct net_device *alloc_ieee80211(int sizeof_priv, int monitor);
extern int libipw_change_mtu(struct net_device *dev, int new_mtu);
extern void libipw_networks_age(struct libipw_device *ieee,
OpenPOWER on IntegriCloud