diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-07-08 01:43:14 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-07-08 01:43:14 +0000 |
| commit | 4d84671f9bc24de7e1cef3c897f26834e05c9637 (patch) | |
| tree | 64e46360464782c04e7ff1e833950683df2fccaa /ws80211_utils.h | |
| parent | 8f12c9d7d7b90c246e5d3000e17a5b83a2c0f340 (diff) | |
| download | wireshark-4d84671f9bc24de7e1cef3c897f26834e05c9637.tar.gz wireshark-4d84671f9bc24de7e1cef3c897f26834e05c9637.tar.bz2 wireshark-4d84671f9bc24de7e1cef3c897f26834e05c9637.zip | |
Keep the NL80211_CHAN_ and WS80211_CHAN_ values distinct; only the
Linux version of the platform-dependent 802.11 stuff should use the
NL80211_CHAN_ stuff. Map from the WS80211_CHAN_ values to the
corresponding NL80211_CHAN_ values in ws80211_set_freq(), and have the
channel_types bitset use bits indexed by WS80211_CHAN_ values rather
than NL80211_CHAN_.
This won't fix the problem of building this on Linuxes with old
nl80211.h headers that lack NL80211_CHAN_, but it narrows the set of
code that needs the NL80211_CHAN_ values, perhaps allowing the fix to be
a bit cleaner, as well as making it easier to make this work on
platforms other than Linux.
svn path=/trunk/; revision=43606
Diffstat (limited to 'ws80211_utils.h')
| -rw-r--r-- | ws80211_utils.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/ws80211_utils.h b/ws80211_utils.h index 12550f1b91..c03589cf5a 100644 --- a/ws80211_utils.h +++ b/ws80211_utils.h @@ -27,17 +27,6 @@ #include <config.h> -#ifdef HAVE_LIBNL - -#include <linux/nl80211.h> -enum ws80211_channel_type { - WS80211_CHAN_NO_HT = NL80211_CHAN_NO_HT, - WS80211_CHAN_HT20 = NL80211_CHAN_HT20, - WS80211_CHAN_HT40MINUS = NL80211_CHAN_HT40MINUS, - WS80211_CHAN_HT40PLUS = NL80211_CHAN_HT40PLUS -}; - -#else enum ws80211_channel_type { WS80211_CHAN_NO_HT, WS80211_CHAN_HT20, @@ -45,8 +34,6 @@ enum ws80211_channel_type { WS80211_CHAN_HT40PLUS }; -#endif - #define CHAN_NO_HT "NOHT" #define CHAN_HT20 "HT20" #define CHAN_HT40MINUS "HT40-" |