-rw-r--r-- | libopie2/opienet/onetwork.h | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h index 00d1ebb..b170ea2 100644 --- a/libopie2/opienet/onetwork.h +++ b/libopie2/opienet/onetwork.h | |||
@@ -34,6 +34,8 @@ | |||
34 | #ifndef ONETWORK_H | 34 | #ifndef ONETWORK_H |
35 | #define ONETWORK_H | 35 | #define ONETWORK_H |
36 | 36 | ||
37 | #include "wireless.h" | ||
38 | |||
37 | /* OPIE */ | 39 | /* OPIE */ |
38 | 40 | ||
39 | #include <opie2/onetutils.h> | 41 | #include <opie2/onetutils.h> |
@@ -46,24 +48,6 @@ | |||
46 | #include <qobject.h> | 48 | #include <qobject.h> |
47 | #include <qhostaddress.h> | 49 | #include <qhostaddress.h> |
48 | 50 | ||
49 | // ML: Yeah, I hate to include kernel headers, but it's necessary here | ||
50 | // ML: Here comes an ugly hack to prevent <linux/wireless.h> including <linux/if.h> | ||
51 | // ML: which conflicts with the user header <net/if.h> | ||
52 | // ML: We really need a user header for the Wireless Extensions, something like <net/wireless.h> | ||
53 | // ML: I will drop Jean a mail on that subject | ||
54 | |||
55 | #include <net/if.h> | ||
56 | |||
57 | #ifndef IFNAMSIZ | ||
58 | #define IFNAMSIZ 16 | ||
59 | #endif | ||
60 | #ifndef IW_MAX_PRIV_DEF | ||
61 | #define IW_MAX_PRIV_DEF 128 | ||
62 | #endif | ||
63 | |||
64 | #define _LINUX_IF_H | ||
65 | #include <linux/wireless.h> | ||
66 | |||
67 | class ONetworkInterface; | 51 | class ONetworkInterface; |
68 | class OWirelessNetworkInterface; | 52 | class OWirelessNetworkInterface; |
69 | class OChannelHopper; | 53 | class OChannelHopper; |