-rw-r--r-- | libopie2/opienet/onetwork.h | 31 |
1 files changed, 9 insertions, 22 deletions
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 | |||
@@ -32,30 +32,9 @@ | |||
32 | #define ONETWORK_H | 32 | #define ONETWORK_H |
33 | 33 | ||
34 | #if !defined( OPIE_WE_VERSION ) | ||
35 | #warning No wireless extension specified; autodetecting... | ||
36 | #include <linux/version.h> | ||
37 | #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23) | ||
38 | #define OPIE_WE_VERSION 15 | ||
39 | #else | ||
40 | #define OPIE_WE_VERSION 16 | ||
41 | #endif // LINUX_VERSION_CODE < KERNEL_VERSION(2.4.23) | ||
42 | #endif // !defined( OPIE_WE_VERSION ) | ||
43 | |||
44 | #if OPIE_WE_VERSION == 15 | ||
45 | #include "wireless.15.h" | ||
46 | #warning Using WE V15 | ||
47 | #endif | ||
48 | #if OPIE_WE_VERSION == 16 | ||
49 | #include "wireless.16.h" | ||
50 | #warning Using WE V16 | ||
51 | #endif | ||
52 | |||
53 | /* OPIE */ | 34 | /* OPIE */ |
54 | |||
55 | #include <opie2/onetutils.h> | 35 | #include <opie2/onetutils.h> |
56 | #include <opie2/ostation.h> | 36 | #include <opie2/ostation.h> |
57 | 37 | ||
58 | /* QT */ | 38 | /* QT */ |
59 | |||
60 | #include <qvaluelist.h> | 39 | #include <qvaluelist.h> |
61 | #include <qdict.h> | 40 | #include <qdict.h> |
@@ -64,7 +43,15 @@ | |||
64 | #include <qhostaddress.h> | 43 | #include <qhostaddress.h> |
65 | 44 | ||
45 | /* STD */ | ||
46 | // hacky workaround until we have a user space wireless.h | ||
47 | #include <net/if.h> | ||
48 | #define _LINUX_IF_H | ||
49 | #include <linux/wireless.h> | ||
50 | #ifndef IW_MAX_PRIV_DEF | ||
51 | #define IW_MAX_PRIV_DEF 128 | ||
52 | #endif | ||
53 | |||
66 | namespace Opie { | 54 | namespace Opie { |
67 | namespace Net { | 55 | namespace Net { |
68 | |||
69 | class ONetworkInterface; | 56 | class ONetworkInterface; |
70 | class OWirelessNetworkInterface; | 57 | class OWirelessNetworkInterface; |