2 files changed, 10 insertions, 1 deletions
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 25c70e0..998b50e 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -42,24 +42,25 @@
 
 /* UNIX */
 
 #include <arpa/inet.h>
 #include <cerrno>
 #include <cstring>
 #include <cstdlib>
 #include <math.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <linux/sockios.h>
 #include <linux/wireless.h>
 
 using namespace std;
 
 /*======================================================================================
  * ONetwork
  *======================================================================================*/
 
 ONetwork* ONetwork::_instance = 0;
 
 ONetwork::ONetwork()
 {
@@ -716,25 +717,25 @@ OHostAPMonitoringInterface::~OHostAPMonitoringInterface()
 {
 }
 
 void OHostAPMonitoringInterface::setEnabled( bool b )
 {
     // IW_MODE_MONITOR was introduced in Wireless Extensions Version 15
     // Wireless Extensions < Version 15 need iwpriv commandos for monitoring
 
     #if WIRELESS_EXT > 14
     _if->_iwr.u.mode = IW_MODE_MONITOR;
     _if->wioctl( SIOCSIWMODE );
     #else
-    int* args = (int*) &_if._iwr.u.name;
+    int* args = (int*) &_if->_iwr.u.name;
     args[0] = 2;
     args[1] = 0;
     _if->wioctl( SIOCDEVPRIVATE );
     #endif
 
     OMonitoringInterface::setEnabled( b );
 }
 
 
 QString OHostAPMonitoringInterface::name() const
 {
     return "hostap";
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index 936ac85..56da5f4 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -39,28 +39,36 @@
 #include <qdict.h>
 #include <qmap.h>
 #include <qobject.h>
 #include <qhostaddress.h>
 
 /* OPIE */
 
 #include <opie2/onetutils.h>
 
 // ML: Yeah, I hate to include kernel headers, but it's necessary here
 // ML: Recent RedHat and MandrakePatches to the Kernel and WE broke something
 // ML: #include <net/if.h> e.g. conflicts with #include <linux/wireless.h>
+
+#ifndef IFNAMSIZ
 #define IFNAMSIZ 16
+#endif
+
 #include <linux/wireless.h>
 #include <net/if.h>
 
+#ifndef SIOCIWFIRSTPRIV
+#define SIOCIWFIRSTPRIV SIOCDEVPRIVATE
+#endif
+
 class ONetworkInterface;
 class OWirelessNetworkInterface;
 class OChannelHopper;
 class OMonitoringInterface;
 
 typedef struct ifreq ifreqstruct;
 typedef struct iwreq iwreqstruct;
 typedef struct iw_event iweventstruct;
 typedef struct iw_freq iwfreqstruct;
 typedef struct iw_priv_args iwprivargsstruct;
 typedef struct iw_range iwrangestruct;