TODO: quick fix

[metze/wireshark/wip.git] / ws80211_utils.h

diff --git a/ws80211_utils.h b/ws80211_utils.h
index 9dfa10839488a027c9ed9ca203eca5125f7393b6..8bca4171b03cca7cb2218661088c1fa30ba148a9 100644 (file)
--- a/ws80211_utils.h
+++ b/ws80211_utils.h
@@ -19,25 +19,12 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef __WS80211_UTILS_H__
 #define __WS80211_UTILS_H__
 
-#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 +32,6 @@ enum ws80211_channel_type {
        WS80211_CHAN_HT40PLUS
 };
 
-#endif
-
 #define CHAN_NO_HT     "NOHT"
 #define CHAN_HT20      "HT20"
 #define CHAN_HT40MINUS "HT40-"
@@ -72,7 +57,7 @@ int ws80211_get_iface_info(const char *name, struct ws80211_iface_info *iface_in
 void ws80211_free_interfaces(GArray *interfaces);
 int ws80211_frequency_to_channel(int freq);
 int ws80211_set_freq(const char *name, int freq, int chan_type);
-int ws80211_str_to_chan_type(gchar *s);
-gchar *ws80211_chan_type_to_str(int type);
+int ws80211_str_to_chan_type(const gchar *s);
+const gchar *ws80211_chan_type_to_str(int type);
 
 #endif /* __WS80211_UTILS_H__ */