has_wext() isn't used if IW_MODE_MONITOR isn't defined, so don't define

it if IW_MODE_MONITOR isn't defined.

diff --git a/pcap-linux.c b/pcap-linux.c
index 249f3e1b141173f7264f6510f991eff3af5436b2..b2dcf926c39ff3b413d9101f611892415db1eb6e 100644 (file)
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.161 2008-11-19 17:36:52 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.162 2008-12-14 20:03:59 guy Exp $ (LBL)";

 #endif
 
 /*
 #endif
 
 /*


@@ -274,10 +274,12 @@ static int        iface_get_mtu(int fd, const char *device, char *ebuf);
 static int     iface_get_arptype(int fd, const char *device, char *ebuf);
 #ifdef HAVE_PF_PACKET_SOCKETS
 static int     iface_bind(int fd, int ifindex, char *ebuf);
 static int     iface_get_arptype(int fd, const char *device, char *ebuf);
 #ifdef HAVE_PF_PACKET_SOCKETS
 static int     iface_bind(int fd, int ifindex, char *ebuf);

+#ifdef IW_MODE_MONITOR

 static int     has_wext(int sock_fd, const char *device, char *ebuf);
 static int     has_wext(int sock_fd, const char *device, char *ebuf);

+#endif /* IW_MODE_MONITOR */

 static int     enter_rfmon_mode_wext(pcap_t *handle, int sock_fd,
     const char *device);
 static int     enter_rfmon_mode_wext(pcap_t *handle, int sock_fd,
     const char *device);

-#endif
+#endif /* HAVE_PF_PACKET_SOCKETS */

 static int     iface_bind_old(int fd, const char *device, char *ebuf);
 
 #ifdef SO_ATTACH_FILTER
 static int     iface_bind_old(int fd, const char *device, char *ebuf);
 
 #ifdef SO_ATTACH_FILTER


@@ -2534,6 +2536,7 @@ iface_bind(int fd, int ifindex, char *ebuf)
        return 1;
 }
 
        return 1;
 }
 

+#ifdef IW_MODE_MONITOR

 /*
  * Check whether the device supports the Wireless Extensions.
  * Returns 1 if it does, 0 if it doesn't, PCAP_ERROR_NO_SUCH_DEVICE
 /*
  * Check whether the device supports the Wireless Extensions.
  * Returns 1 if it does, 0 if it doesn't, PCAP_ERROR_NO_SUCH_DEVICE


@@ -2542,7 +2545,6 @@ iface_bind(int fd, int ifindex, char *ebuf)
 static int
 has_wext(int sock_fd, const char *device, char *ebuf)
 {
 static int
 has_wext(int sock_fd, const char *device, char *ebuf)
 {

-#ifdef IW_MODE_MONITOR

        struct iwreq ireq;
 
        strncpy(ireq.ifr_ifrn.ifrn_name, device,
        struct iwreq ireq;
 
        strncpy(ireq.ifr_ifrn.ifrn_name, device,


@@ -2554,9 +2556,9 @@ has_wext(int sock_fd, const char *device, char *ebuf)
            "%s: SIOCGIWPRIV: %s", device, pcap_strerror(errno));
        if (errno == ENODEV)
                return PCAP_ERROR_NO_SUCH_DEVICE;
            "%s: SIOCGIWPRIV: %s", device, pcap_strerror(errno));
        if (errno == ENODEV)
                return PCAP_ERROR_NO_SUCH_DEVICE;

-#endif

        return 0;
 }
        return 0;
 }

+#endif

 
 /*
  * Per me si va ne la citta dolente,
 
 /*
  * Per me si va ne la citta dolente,