diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-16 23:43:01 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-16 23:43:01 -0800 |
| commit | 8494347eedd2facf474021c615d1d07c62e04afd (patch) | |
| tree | ceba54fc99271dc45c629b9a60e98022d9735a05 /drivers/net/wireless/ipw2x00/libipw.h | |
| parent | 91e9c07bd635353d1a278bdb38dbb56ac371bcb8 (diff) | |
| parent | 505c92470bda486be589729514d3ed5302fb0551 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
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 bf45391172f..1e334ff6bd5 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, |