From fb6f93892d4d0e0471d62f5b5ab6d9bdef0a5e76 Mon Sep 17 00:00:00 2001
From: mickeyl <mickeyl>
Date: Mon, 03 May 2004 09:40:07 +0000
Subject: remove the OPIE_WE_VERSION crap. this was a step into the wrong direction.

remove the wireless.h user headers also. we are doomed to use the kernel
ones until Jean himself provides user headers. As a nice side effect,
the automatic WE_VERSION detected has been removed. It was too weak anyway,
since e.g. the handhelds.org community updated kernel 2.4.19 to WE V16
about 14 months ago...
---
(limited to 'libopie2/opienet/onetwork.h')

diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index a49c8fb..057b1a0 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -31,41 +31,28 @@
 #ifndef ONETWORK_H
 #define ONETWORK_H
 
-#if !defined( OPIE_WE_VERSION )
-    #warning No wireless extension specified; autodetecting...
-    #include <linux/version.h>
-    #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23)
-        #define OPIE_WE_VERSION 15
-    #else
-        #define OPIE_WE_VERSION 16
-    #endif // LINUX_VERSION_CODE < KERNEL_VERSION(2.4.23)
-#endif // !defined( OPIE_WE_VERSION )
-
-#if OPIE_WE_VERSION == 15
-#include "wireless.15.h"
-#warning Using WE V15
-#endif
-#if OPIE_WE_VERSION == 16
-#include "wireless.16.h"
-#warning Using WE V16
-#endif
-
 /* OPIE */
-
 #include <opie2/onetutils.h>
 #include <opie2/ostation.h>
 
 /* QT */
-
 #include <qvaluelist.h>
 #include <qdict.h>
 #include <qmap.h>
 #include <qobject.h>
 #include <qhostaddress.h>
 
+/* STD */
+// hacky workaround until we have a user space wireless.h
+#include <net/if.h>
+#define _LINUX_IF_H
+#include <linux/wireless.h>
+#ifndef IW_MAX_PRIV_DEF
+#define IW_MAX_PRIV_DEF        128
+#endif
+
 namespace Opie {
 namespace Net  {
-
 class ONetworkInterface;
 class OWirelessNetworkInterface;
 class OChannelHopper;
--
cgit v0.9.0.2