wifi: remove dependency on wireless-tools/libiw

This commit is contained in:
Dan Williams 2011-09-29 15:51:55 -05:00
parent 316d0ed106
commit 7d0761588c
2 changed files with 7 additions and 6 deletions

View file

@ -217,8 +217,7 @@ AC_COMPILE_IFELSE(
#include <sys/types.h>
#include <linux/types.h>
#include <sys/socket.h>
#include <net/if.h>
#include <wireless.h>]],
#include <linux/wireless.h>]],
[[#ifndef IWEVGENIE
#error "not found"
#endif]])],
@ -226,7 +225,7 @@ AC_COMPILE_IFELSE(
[ac_have_iwevgenie=no])
AC_MSG_RESULT($ac_have_iwevgenie)
if test "$ac_have_iwevgenie" = no; then
AC_MSG_ERROR(wireless-tools or libiw development headers >= 28pre9 not installed or not functional)
AC_MSG_ERROR(Linux kernel development headers not installed or not functional)
fi
dnl

View file

@ -24,6 +24,8 @@
#include <string.h>
#include <sys/ioctl.h>
#include <net/ethernet.h>
#include <unistd.h>
#include <math.h>
#include <glib.h>
@ -84,12 +86,12 @@ wifi_data_free (WifiData *data)
/***************************************************************/
#include <iwlib.h>
#include <linux/wireless.h>
typedef struct {
WifiData parent;
int fd;
iwqual max_qual;
struct iw_quality max_qual;
gint8 num_freqs;
guint32 freqs[IW_MAX_FREQUENCIES];
} WifiDataWext;
@ -477,7 +479,7 @@ wext_get_range (WifiDataWext *wext,
NM_WIFI_DEVICE_CAP_RSN)
static guint32
wext_get_caps (WifiDataWext *wext, iwrange *range)
wext_get_caps (WifiDataWext *wext, struct iw_range *range)
{
guint32 caps = NM_WIFI_DEVICE_CAP_NONE;