diff options
| author | John W. Linville <linville@tuxdriver.com> | 2009-11-13 16:56:13 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-11-13 17:33:48 -0500 |
| commit | 8cc3174ef98fbb317d9ee18e20102908ff7faffc (patch) | |
| tree | c5b22434cdb51beaf548542d24c5e9301499b930 /drivers/net/wireless/ipw2x00/libipw.h | |
| parent | d01032e4fd33110f9f3a085a36cb819c1dfc5827 (diff) | |
| download | op-kernel-dev-8cc3174ef98fbb317d9ee18e20102908ff7faffc.zip op-kernel-dev-8cc3174ef98fbb317d9ee18e20102908ff7faffc.tar.gz | |
Revert "libipw: initiate cfg80211 API conversion"
This reverts commit b8ecd988b1670035a05035c553c08331214d6603.
Due to poor API call balancing by me, this commit not only broke ipw2200
if it can't find it's firmware, it broke ipw2100 basically anytime you
removed the module. At this point in the cycle, let's just put it back
to a sane state and try again next time...
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.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/ipw2x00/libipw.h b/drivers/net/wireless/ipw2x00/libipw.h index bf45391..1e334ff 100644 --- a/drivers/net/wireless/ipw2x00/libipw.h +++ b/drivers/net/wireless/ipw2x00/libipw.h @@ -31,7 +31,6 @@ #include <linux/ieee80211.h> #include <net/lib80211.h> -#include <net/cfg80211.h> #define LIBIPW_VERSION "git-1.1.13" @@ -784,15 +783,12 @@ 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; @@ -1018,8 +1014,8 @@ static inline int libipw_is_cck_rate(u8 rate) } /* ieee80211.c */ -extern void free_ieee80211(struct net_device *dev, int monitor); -extern struct net_device *alloc_ieee80211(int sizeof_priv, int monitor); +extern void free_ieee80211(struct net_device *dev); +extern struct net_device *alloc_ieee80211(int sizeof_priv); extern int libipw_change_mtu(struct net_device *dev, int new_mtu); extern void libipw_networks_age(struct libipw_device *ieee, |
