diff options
| author | Daniel Drake <dsd@gentoo.org> | 2007-11-19 15:00:29 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:04:47 -0800 |
| commit | 459c51ad6e1fc19e91a53798358433d3c08cd09d (patch) | |
| tree | fb86feacf1b229cb4ab6b36b4d1deaf4983b1e45 /drivers/net/wireless/zd1211rw/zd_ieee80211.h | |
| parent | 0765af4493193149505f118d04d9300f0a15c8f5 (diff) | |
zd1211rw: port to mac80211
This seems to be working smoothly now. Let's not hold back the mac80211
transition any further. This patch ports the existing driver from softmac
to mac80211.
Many thanks to everyone who helped out with the porting efforts.
Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_ieee80211.h')
| -rw-r--r-- | drivers/net/wireless/zd1211rw/zd_ieee80211.h | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_ieee80211.h b/drivers/net/wireless/zd1211rw/zd_ieee80211.h index fbf6491dce7..98b87cfe874 100644 --- a/drivers/net/wireless/zd1211rw/zd_ieee80211.h +++ b/drivers/net/wireless/zd1211rw/zd_ieee80211.h @@ -1,7 +1,7 @@ #ifndef _ZD_IEEE80211_H #define _ZD_IEEE80211_H -#include <net/ieee80211.h> +#include <net/mac80211.h> /* Additional definitions from the standards. */ @@ -19,22 +19,7 @@ enum { MAX_CHANNEL24 = 14, }; -struct channel_range { - u8 start; - u8 end; /* exclusive (channel must be less than end) */ -}; - -struct iw_freq; - -int zd_geo_init(struct ieee80211_device *ieee, u8 regdomain); - -const struct channel_range *zd_channel_range(u8 regdomain); -int zd_regdomain_supports_channel(u8 regdomain, u8 channel); -int zd_regdomain_supported(u8 regdomain); - -/* for 2.4 GHz band */ -int zd_channel_to_freq(struct iw_freq *freq, u8 channel); -int zd_find_channel(u8 *channel, const struct iw_freq *freq); +void zd_geo_init(struct ieee80211_hw *hw, u8 regdomain); #define ZD_PLCP_SERVICE_LENGTH_EXTENSION 0x80 @@ -54,8 +39,8 @@ static inline u8 zd_ofdm_plcp_header_rate(const struct ofdm_plcp_header *header) * * See the struct zd_ctrlset definition in zd_mac.h. */ -#define ZD_OFDM_PLCP_RATE_6M 0xb -#define ZD_OFDM_PLCP_RATE_9M 0xf +#define ZD_OFDM_PLCP_RATE_6M 0xb +#define ZD_OFDM_PLCP_RATE_9M 0xf #define ZD_OFDM_PLCP_RATE_12M 0xa #define ZD_OFDM_PLCP_RATE_18M 0xe #define ZD_OFDM_PLCP_RATE_24M 0x9 @@ -87,10 +72,4 @@ static inline u8 zd_cck_plcp_header_signal(const struct cck_plcp_header *header) #define ZD_CCK_PLCP_SIGNAL_5M5 0x37 #define ZD_CCK_PLCP_SIGNAL_11M 0x6e -enum ieee80211_std { - IEEE80211B = 0x01, - IEEE80211A = 0x02, - IEEE80211G = 0x04, -}; - #endif /* _ZD_IEEE80211_H */ |