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...

5 files changed, 10 insertions, 1479 deletions

diff --git a/config.in b/config.in
index 5c23904..99341e6 100644
--- a/config.in
+++ b/config.in
@@ -1,265 +1,254 @@
 mainmenu "Opie Configuration"
 
 menu "Build Parameters"
 
 choice
   prompt "Target Machine"
   default TARGET_X86
   help
     Please select the architecture of the machine you will be
     building the OpenZaurus buildroot for.
 
   config TARGET_X86
     boolean "Intel X86"
 
   config TARGET_MACOSX
     boolean "Mac OS X (DARWIN)"
 
   config TARGET_SHARP
     boolean "Sharp Zaurus w/ SA1100 (5000 and 5500)"
 
   config TARGET_C700
     boolean "Sharp Zaurus w/ PXA25x (5600, C7x0, C8x0)"
 
   config TARGET_IPAQ
     boolean "iPAQ"
 
   config TARGET_RAMSES
     boolean "Ramses"
 
   config TARGET_SIMPAD
     boolean "SIMpad"
 
   config TARGET_YOPY
     boolean "Yopy 3500/3700"  
 
 endchoice
 
 config OPTIMIZE
   boolean "Use optimizations"
   default "y" if ! TARGET_X86
 
 # added for threaded compile
 config THREADED
   boolean "Enable threaded build"
   default "n"
 
 config DEBUG
   boolean "Enable debug builds"
   default n
 config RELEASE
   bool
   default y
   depends !DEBUG
   
 config QUICK_LAUNCH
   boolean "Enable Quick Launch"
   default n if TARGET_X86
   default y if ! TARGET_X86
   
 config QUICKLAUNCH_PATH
   string "Path to quicklauncher"
   default "./quicklauncher" if TARGET_X86
   default "/opt/QtPalmtop/bin/quicklauncher" if ! TARGET_X86
 
 config SPECFILE
   string
   default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
   default "linux-g++" if TARGET_X86 && X11
   default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
   default "linux-g++" if TARGET_SHARP && X11
   default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
   default "linux-g++" if TARGET_IPAQ && X11
   default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11)
   default "linux-g++" if TARGET_RAMSES && X11
   default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11)
   default "linux-g++" if TARGET_SIMPAD && X11
   default "qws/linux-yopy-g++" if TARGET_YOPY && (! X11)
   default "qws/macx-generic-g++" if TARGET_MACOSX && (! X11)
 
 config CUSTOMFILE
   string
   default "custom-ipaq.h" if TARGET_IPAQ
   default "custom-sharp.h" if TARGET_SHARP
   default "custom-ramses.h" if TARGET_RAMSES
   default "custom-ipaq.h" if TARGET_SIMPAD
   default "custom-yopy.h" if TARGET_YOPY
 
 config OPTIMIZATIONS
   string "Optimization flags"
   depends OPTIMIZE
   default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ
   default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_YOPY
   default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP
   default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_RAMSES
   default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SIMPAD
   default "-march=armv5te -mtune=xscale -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_C700
 
 config EXPERIMENTAL
   bool "Prompt for development and/or incomplete items"
   default y
 
 endmenu
 
 menu "Configuration"
 config OPIE_NO_OVERRIDE_QT
   boolean "Build Opie against an unpatched version of Qt"
   default n
 
 config OPIE_NO_BUILTIN_SHUTDOWN
   boolean "Disable the built in shutdown application"
   default y
 
 config OPIE_NO_BUILTIN_CALIBRATE
   boolean "Disable the built in calibrate application"
   default y if TARGET_YOPY
   default n if ! TARGET_YOPY
 
 config OPIE_SOUND_FRAGMENT_SHIFT
   string  "The sound fragment used in Opie Player I"
   default "14" if TARGET_IPAQ
   default "16" if ! TARGET_IPAQ
 
 config USE_REALTIME_AUDIO_THREAD
   boolean "Use a realtime thread in Opie Player I"
   default y if TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP
   default n if ! (TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP)
 
 config QT_QWS_ALLOW_OVERCLOCK
   boolean "Allow the user to overclock the device"
   depends TARGET_RAMSES
   default n
 
 config OPIE_HIGH_RES_SMALL_PHY
   boolean "Resolution is bigger than physical screen"
   default y if TARGET_C700
   default n if ! TARGET_C700
 
 config USE_FILE_NOTIFICATION
   boolean "Substitute (some) polling interfaces with OFileNotifier"
   default y
 
 config OPIE_NEW_ALLOC
   boolean "Use malloc and free for the implementation"
   default y if TARGET_RAMSES || TARGET_IPAQ || TARGET_SIMPAD || TARGET_SHARP
   default n if ! (TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP)
 
 config OPIE_NO_SOUND_PCM_READ_BITS
   boolean "There is not a pcm_read_bits io control"
   default y if TARGET_SHARP
   default n if ! TARGET_SHARP
-
-config OPIE_WE_VERSION_OVERRIDE
-  boolean "Override autodetection of wireless extension (WE) version"
-  default n
-
-config OPIE_WE_VERSION
-  depends OPIE_WE_VERSION_OVERRIDE
-  string  "The wireless extension (WE) version to build against"
-  default "15" if ! TARGET_X86
-  default "16" if TARGET_X86
-
 endmenu
 
 menu "Dependencies"
     source dependencies.in
 endmenu
 
 menu "Base"
   choice
     prompt "Qpe Library Selection"
     default LIBQPE
     source library/config.in
     source x11/config.in
   endchoice
   source libopie/config.in
 
   source libopie2/config.in
   source libqtaux/config.in
   source rsync/config.in
   source core/opie-login/config.in
   source core/opiealarm/config.in
   source core/tools/quicklauncher/config.in
   source core/launcher/config.in
   source core/symlinker/config.in
 endmenu
 
 comment ""
 
 menu "Applets"
   source core/applets/config.in
   source noncore/applets/config.in
 endmenu
 
 menu "Apps"
   source core/apps/config.in
   source noncore/apps/config.in
 endmenu
 
 menu "Communications and Networking"
   source noncore/comm/config.in
   source noncore/net/config.in
 endmenu
 
 menu "Games"
   source noncore/games/config.in
 endmenu
 
 menu "Graphics and Multimedia"
   source freetype/config.in
   source noncore/graphics/config.in
   source core/multimedia/config.in
   source noncore/multimedia/config.in
 endmenu
 
 menu "Input methods"
   source inputmethods/config.in
 endmenu
 
 menu "Pim"
   source core/pim/config.in
   comment "Today Plugins ---"
     source noncore/todayplugins/config.in
     source core/pim/today/plugins/config.in
 endmenu
 
 menu "Settings"
   source core/settings/config.in
   source noncore/settings/config.in
 endmenu
 
 menu "Theming"
   comment "Decorations ---"
   source noncore/decorations/config.in
   comment "Styles ---"
   source noncore/styles/config.in
 endmenu
 
 menu "Tools"
   source noncore/tools/config.in
 endmenu
 
 menu "Development"
   source development/keyview/config.in
   #source development/debugviewer/config.in
 endmenu
 
 menu "Examples"
     config EXAMPLES
         boolean "Compile Example Application"
     source examples/config.in
 endmenu
 
 comment ""
 
 menu "Unsupported / Unmaintained"
   source noncore/unsupported/config.in
 endmenu
 
 comment ""
   depends on EXPERIMENTAL
 menu "Experimental"
   depends on EXPERIMENTAL
   source libslcompat/config.in
   source core/qws/config.in
 endmenu
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
@@ -1,601 +1,588 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) 2003-2004 by Michael 'Mickey' Lauer
               =.             <mickey@Vanille.de>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #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;
 class OMonitoringInterface;
 
 /*======================================================================================
  * ONetwork
  *======================================================================================*/
 
 /**
  * @brief A container class for all network interfaces
  *
  * This class provides access to all available network interfaces of your computer.
  *
  * @author Michael 'Mickey' Lauer <mickey@vanille.de>
  */
 class ONetwork : public QObject
 {
   Q_OBJECT
 
   public:
     typedef QDict<ONetworkInterface> InterfaceMap;
     typedef QDictIterator<ONetworkInterface> InterfaceIterator;
 
   public:
     /**
      * @returns the number of available interfaces
      */
     int count() const;
     /**
      * @returns a pointer to the (one and only) @ref ONetwork instance.
      */
     static ONetwork* instance();
     /**
      * @returns an iterator usable for iterating through all network interfaces.
      */
     InterfaceIterator iterator() const;
     /**
      * @returns true, if the @a interface is present.
      */
     bool isPresent( const char* interface ) const;
     /**
      * @returns true, if the @a interface supports the wireless extension protocol.
      */
     bool isWirelessInterface( const char* interface ) const;
     /**
      * @returns a pointer to the @ref ONetworkInterface object for the specified @a interface or 0, if not found.
      * @see ONetworkInterface
      */
     ONetworkInterface* interface( const QString& interface ) const;
     /**
      * @internal Rebuild the internal interface database
      * @note Sometimes it might be useful to call this from client code,
      * e.g. after issuing a cardctl insert
      */
     void synchronize();
     /**
      * @returns the wireless extension version used at compile time.
      **/
     static short wirelessExtensionCompileVersion();
 
   protected:
     ONetwork();
 
   private:
     static ONetwork* _instance;
     InterfaceMap _interfaces;
     class Private;
     Private *d;
 };
 
 
 /*======================================================================================
  * ONetworkInterface
  *======================================================================================*/
 
 /**
  * @brief A network interface wrapper.
  *
  * This class provides a wrapper for a network interface. All the cumbersume details of
  * Linux ioctls are hidden under a convenient high-level interface.
  * @warning Most of the setting methods contained in this class require the appropriate
  * process permissions to work.
  *
  * @author Michael 'Mickey' Lauer <mickey@vanille.de>
  */
 class ONetworkInterface : public QObject
 {
     friend class OMonitoringInterface;
     friend class OCiscoMonitoringInterface;
     friend class OWlanNGMonitoringInterface;
     friend class OHostAPMonitoringInterface;
     friend class OOrinocoMonitoringInterface;
 
   public:
     /**
      * Constructor. Normally you don't create @ref ONetworkInterface objects yourself,
      * but access them via @ref ONetwork::interface().
      */
     ONetworkInterface( QObject* parent, const char* name );
     /**
      * Destructor.
      */
     virtual ~ONetworkInterface();
     /**
      * Associates a @a monitoring interface with this network interface.
      * @note This is currently only useful with @ref OWirelessNetworkInterface objects.
      */
     void setMonitoring( OMonitoringInterface* monitoring );
     /**
      * @returns the currently associated monitoring interface or 0, if no monitoring is associated.
      */
     OMonitoringInterface* monitoring() const;
     /**
      * Setting an interface to promiscuous mode enables the device to receive
      * all packets on the shared medium - as opposed to packets which are addressed to this interface.
      */
     bool setPromiscuousMode( bool );
     /**
      * @returns true if the interface is set to promiscuous mode.
      */
     bool promiscuousMode() const;
     /**
      * Setting an interface to up enables it to receive packets.
      */
     bool setUp( bool );
     /**
      * @returns true if the interface is up.
      */
     bool isUp() const;
     /**
      * @returns true if the interface is a loopback interface.
      */
     bool isLoopback() const;
     /**
      * @returns true if the interface is featuring supports the wireless extension protocol.
      */
     bool isWireless() const;
     /**
      * Associate the IP address @ addr with the interface.
      */
     void setIPV4Address( const QHostAddress& addr );
     /**
      * @returns the IPv4 address associated with the interface.
      */
     QString ipV4Address() const; //TODO: make this return an OHostAddress
     /**
      * Associate the MAC address @a addr with the interface.
      * @note It can be necessary to shut down the interface prior to calling this method.
      * @warning This is not supported by all drivers.
      */
     void setMacAddress( const OMacAddress& addr );
     /**
      * @returns the MAC address associated with the interface.
      */
     OMacAddress macAddress() const;
     /**
      * Associate the IPv4 @a netmask with the interface.
      */
     void setIPV4Netmask( const QHostAddress& netmask );
     /**
      * @returns the IPv4 netmask associated with the interface.
      */
     QString ipV4Netmask() const; //TODO: make this return an OHostAddress
     /**
      * @returns the data link type currently associated with the interface.
      * @see #include <net/if_arp.h> for possible values.
      */
     int dataLinkType() const;
 
   protected:
     const int _sfd;
     mutable ifreq _ifr;
     OMonitoringInterface* _mon;
 
   protected:
     struct ifreq& ifr() const;
     virtual void init();
     bool ioctl( int call ) const;
     bool ioctl( int call, struct ifreq& ) const;
   private:
     class Private;
     Private *d;
 };
 
 /*======================================================================================
  * OChannelHopper
  *======================================================================================*/
 
 /**
  * @brief A radio frequency channel hopper.
  *
  * This class provides a channel hopper for radio frequencies. A channel hopper frequently
  * changes the radio frequency channel of its associated @ref OWirelessNetworkInterface.
  * This is necessary when in monitoring mode and scanning for other devices, because
  * the radio frequency hardware can only detect packets sent on the same frequency.
  *
  * @author Michael 'Mickey' Lauer <mickey@vanille.de>
  */
 class OChannelHopper : public QObject
 {
   Q_OBJECT
 
   public:
     /**
      * Constructor.
      */
     OChannelHopper( OWirelessNetworkInterface* );
     /**
      * Destructor.
      */
     virtual ~OChannelHopper();
     /**
      * @returns true, if the channel hopper is hopping channels
      */
     bool isActive() const;
     /**
      * @returns the last hopped channel
      */
     int channel() const;
     /**
      * Set the channel hopping @a interval.
      * An interval of 0 deactivates the channel hopper.
      */
     void setInterval( int interval );
     /**
      * @returns the channel hopping interval
      */
     int interval() const;
 
   signals:
     /**
      * This signal is emitted right after the channel hopper performed a hop
      */
     void hopped( int );
 
   protected:
     virtual void timerEvent( QTimerEvent* );
 
   private:
     OWirelessNetworkInterface* _iface;
     int _interval;
     int _tid;
     QValueList<int> _channels;
     QValueList<int>::Iterator _channel;
     class Private;
     Private *d;
 };
 
 
 /*======================================================================================
  * OWirelessNetworkInterface
  *======================================================================================*/
 
 /**
  * @brief A network interface wrapper for interfaces supporting the wireless extensions protocol.
  *
  * This class provides a high-level encapsulation of the Linux wireless extension API.
  *
  * @author Michael 'Mickey' Lauer <mickey@vanille.de>
  */
 class OWirelessNetworkInterface : public ONetworkInterface
 {
     friend class OMonitoringInterface;
     friend class OCiscoMonitoringInterface;
     friend class OWlanNGMonitoringInterface;
     friend class OHostAPMonitoringInterface;
     friend class OOrinocoMonitoringInterface;
 
     friend class OPrivateIOCTL;
 
   public:
     /**
      * Constructor.
      */
     OWirelessNetworkInterface( QObject* parent, const char* name );
     /**
      * Destructor.
      */
     virtual ~OWirelessNetworkInterface();
     /**
      * Setting the @a channel of the interface changes the radio frequency (RF)
      * of the corresponding wireless network device.
      * @note Common channel range is within [1-14]. A value of 0 is not allowed.
      * @see channels()
      */
     virtual void setChannel( int channel ) const;
     /**
      * @returns the channel index of the current radio frequency.
      */
     virtual int channel() const;
     /**
      * @returns the current radio frequency (in MHz).
      */
     virtual double frequency() const;
     /**
      * @returns the number of radio frequency channels for the
      * corresponding wireless network device.
      * @note European devices usually have 14 channels, while American typically feature 11 channels.
      */
     virtual int channels() const;
     /**
      * Set the IEEE 802.11 operation @a mode.
      * Valid values are <ul><li>adhoc<li>managed<li>monitor<li>master
      * @warning Not all drivers support the all modes.
      * @note You might have to change the SSID to get the operation mode change into effect.
      */
     virtual void setMode( const QString& mode );
     /**
      * @returns the current IEEE 802.11 operation mode.
      * Possible values are <ul><li>adhoc<li>managed<li>monitor<li>master or <li>unknown
      *
      * @note: Important note concerning the 'monitor' mode:
      * Setting the monitor mode on a wireless network interface enables
      * listening to IEEE 802.11 data and management frames which normally
      * are handled by the device firmware. This can be used to detect
      * other wireless network devices, e.g. Access Points or Ad-hoc stations.
      * @warning Standard wireless network drives don't support the monitor mode.
      * @warning You need a patched driver for this to work.
      * @note Enabling the monitor mode is highly driver dependent and requires
      * the proper @ref OMonitoringInterface to be associated with the interface.
      * @see OMonitoringInterface
      */
     virtual QString mode() const;
     /**
      * Set the channel hopping @a interval. An @a interval of 0 disables channel hopping.
      * @see OChannelHopper
      */
     virtual void setChannelHopping( int interval = 0 );
     /**
      * @returns the channel hopping interval or 0, if channel hopping is disabled.
      */
     virtual int channelHopping() const;
     /**
      * @returns the @ref OChannelHopper of this interface or 0, if channel hopping has not been activated before
      */
     virtual OChannelHopper* channelHopper() const;
     /**
      * Set the station @a nickname.
      */
     virtual void setNickName( const QString& nickname );
     /**
      * @returns the current station nickname.
      */
     virtual QString nickName() const;
     /**
      * Invoke the private IOCTL @a command with a @number of parameters on the network interface.
      * @see OPrivateIOCTL
      */
     virtual void setPrivate( const QString& command, int number, ... );
     /**
      * @returns true if the interface is featuring the private IOCTL @command.
      */
     virtual bool hasPrivate( const QString& command );
     virtual void getPrivate( const QString& command ); //FIXME: Implement and document this
     /**
      * @returns true if the interface is associated to an access point
      * @note: This information is only valid if the interface is in managed mode.
      */
     virtual bool isAssociated() const;
     /**
      * @returns the MAC address of the Access Point if the device is in infrastructure mode.
      * @returns a (more or less random) cell ID address if the device is in adhoc mode.
      */
     virtual OMacAddress associatedAP() const;
     /**
      * Set the @a ssid (Service Set ID) string. This is used to decide
      * which network to associate with (use "any" to let the driver decide).
      */
     virtual void setSSID( const QString& ssid );
     /**
      * @returns the current SSID (Service Set ID).
      */
     virtual QString SSID() const;
     /**
      * Perform scanning the wireless network neighbourhood.
      * @note: UNSTABLE API - UNDER CONSTRUCTION - DON'T USE!
      */
     virtual OStationList* scanNetwork();
     /**
      * @return signal strength to associated neighbour (in percent).
      * In infrastructure mode, this is the signal strength of the Access Point.
      * In other modes the result is driver dependent.
      */
     virtual int signalStrength() const;
     /**
      * @returns the wireless extension version used by the interface driver.
      **/
     short wirelessExtensionDriverVersion() const;
     /**
      * @internal commit pending changes to the driver
      */
     void commit() const;
 
   protected:
     void buildInformation();
     void buildPrivateList();
     void dumpInformation() const;
     virtual void init();
     struct iwreq& iwr() const;
     bool wioctl( int call ) const;
     bool wioctl( int call, struct iwreq& ) const;
 
   protected:
     mutable struct iwreq _iwr;
     QMap<int,int> _channels;
     struct iw_range _range;
 
   private:
     OChannelHopper* _hopper;
     class Private;
     Private *d;
 };
 
 
 /*======================================================================================
  * OMonitoringInterface
  *======================================================================================*/
 
 
 class OMonitoringInterface
 {
   public:
     OMonitoringInterface();
     OMonitoringInterface( ONetworkInterface*, bool _prismHeader );
     virtual ~OMonitoringInterface();
 
   public:
     virtual void setEnabled( bool );
     virtual void setChannel( int );
 
     virtual QString name() const = 0;
 
   protected:
     OWirelessNetworkInterface* _if;
     bool _prismHeader;
   private:
     class Private;
     Private *d;
 
 };
 
 
 /*======================================================================================
  * OCiscoMonitoring
  *======================================================================================*/
 
 
 class OCiscoMonitoringInterface : public OMonitoringInterface
 {
   public:
     OCiscoMonitoringInterface( ONetworkInterface*, bool _prismHeader );
     virtual ~OCiscoMonitoringInterface();
 
     virtual void setEnabled( bool );
     virtual QString name() const;
     virtual void setChannel( int );
   private:
     class Private;
     Private *d;
 
 };
 
 
 /*======================================================================================
  * OWlanNGMonitoringInterface
  *======================================================================================*/
 
 
 class OWlanNGMonitoringInterface : public OMonitoringInterface
 {
   public:
     OWlanNGMonitoringInterface( ONetworkInterface*, bool _prismHeader );
     virtual ~OWlanNGMonitoringInterface();
 
   public:
     virtual void setEnabled( bool );
     virtual QString name() const;
     virtual void setChannel( int );
   private:
     class Private;
     Private *d;
 
 };
 
 
 /*======================================================================================
  * OHostAPMonitoringInterface
  *======================================================================================*/
 
 
 class OHostAPMonitoringInterface : public OMonitoringInterface
 {
   public:
     OHostAPMonitoringInterface( ONetworkInterface*, bool _prismHeader );
     virtual ~OHostAPMonitoringInterface();
 
   public:
     virtual void setEnabled( bool );
     virtual QString name() const;
 
   private:
     class Private;
     Private *d;
  };
 
 
 /*======================================================================================
  * OOrinocoMonitoringInterface
  *======================================================================================*/
 
 
 class OOrinocoMonitoringInterface : public OMonitoringInterface
 {
   public:
     OOrinocoMonitoringInterface( ONetworkInterface*, bool _prismHeader );
     virtual ~OOrinocoMonitoringInterface();
 
    public:
     virtual void setChannel( int );
     virtual void setEnabled( bool );
     virtual QString name() const;
 
    private:
     class Private;
     Private *d;
 };
 
 }
 }
 
 #endif // ONETWORK_H
 
diff --git a/libopie2/opienet/ostation.cpp b/libopie2/opienet/ostation.cpp
index 140b924..ce0995b 100644
--- a/libopie2/opienet/ostation.cpp
+++ b/libopie2/opienet/ostation.cpp
@@ -1,72 +1,72 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) 2003 by Michael 'Mickey' Lauer <mickey@Vanille.de>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <opie2/ostation.h>
 #include <opie2/odebug.h>
 
 
 using namespace Opie::Core;
 
 namespace Opie {
 namespace Net {
 /*======================================================================================
  * OStation
  *======================================================================================*/
 
 OStation::OStation()
 {
     odebug << "OStation::OStation()" << oendl;
 
     type = "<unknown>";
     macAddress = OMacAddress::unknown;
     ssid = "<unknown>";
     channel = 0;
     apAddress = OMacAddress::unknown;
 
 }
 
 
 OStation::~OStation()
 {
     odebug << "OStation::~OStation()" << oendl;
 }
 
 
 void OStation::dump()
 {
     odebug << "------- OStation::dump() ------------" << oendl;
     qDebug( "type: %s", (const char*) type );
     qDebug( "mac:  %s", (const char*) macAddress.toString() );
     qDebug( "ap:   %s", (const char*) apAddress.toString() );
     qDebug( "ip:   %s", (const char*) ipAddress.toString() );
 }
 
 }
-}
\ No newline at end of file
+}
diff --git a/libopie2/opienet/wireless.15.h b/libopie2/opienet/wireless.15.h
deleted file mode 100644
index 8135e97..0000000
--- a/libopie2/opienet/wireless.15.h
+++ b/dev/null
@@ -1,705 +0,0 @@
-/*
- * This file define a set of standard wireless extensions
- *
-         * Version :    1512.7.02
- *
-         * Authors :Jean Tourrilhes - HPL - <jt@hpl.hp.com>
- * Copyright (c) 1997-2002 Jean Tourrilhes, All Rights Reserved.
- */
-
-#ifndef _LINUX_WIRELESS_H
-#define _LINUX_WIRELESS_H
-
-/************************** DOCUMENTATION **************************/
-/*
- * Initial APIs (1996 -> onward) :
- * -----------------------------
- * Basically, the wireless extensions are for now a set of standard ioctl
- * call + /proc/net/wireless
- *
- * The entry /proc/net/wireless give statistics and information on the
- * driver.
- * This is better than having each driver having its entry because
- * its centralised and we may remove the driver module safely.
- *
- * Ioctl are used to configure the driver and issue commands.  This is
- * better than command line options of insmod because we may want to
- * change dynamically (while the driver is running) some parameters.
- *
- * The ioctl mechanimsm are copied from standard devices ioctl.
- * We have the list of command plus a structure descibing the
- * data exchanged...
- * Note that to add these ioctl, I was obliged to modify :
-         *# net/core/dev.c (two place + add include)
-         *# net/ipv4/af_inet.c (one place + add include)
- *
- * /proc/net/wireless is a copy of /proc/net/dev.
- * We have a structure for data passed from the driver to /proc/net/wireless
- * Too add this, I've modified :
-         *# net/core/dev.c (two other places)
-         *# include/linux/netdevice.h (one place)
-         *# include/linux/proc_fs.h (one place)
- *
- * New driver API (2002 -> onward) :
- * -------------------------------
- * This file is only concerned with the user space API and common definitions.
- * The new driver API is defined and documented in :
-         *# include/net/iw_handler.h
- *
- * Note as well that /proc/net/wireless implementation has now moved in :
-         *# include/linux/wireless.c
- *
- * Wireless Events (2002 -> onward) :
- * --------------------------------
- * Events are defined at the end of this file, and implemented in :
-         *# include/linux/wireless.c
- *
- * Other comments :
- * --------------
- * Do not add here things that are redundant with other mechanisms
- * (drivers init, ifconfig, /proc/net/dev, ...) and with are not
- * wireless specific.
- *
- * These wireless extensions are not magic : each driver has to provide
- * support for them...
- *
- * IMPORTANT NOTE : As everything in the kernel, this is very much a
- * work in progress. Contact me if you have ideas of improvements...
- */
-
-/***************************** INCLUDES *****************************/
-
-#include <sys/types.h>
-#include <net/if.h>
-#include <linux/types.h>
-
-#ifndef IFNAMSIZ
-#define IFNAMSIZ 16
-#endif
-#ifndef IW_MAX_PRIV_DEF
-#define IW_MAX_PRIV_DEF        128
-#endif
-
-/***************************** VERSION *****************************/
-/*
- * This constant is used to know the availability of the wireless
- * extensions and to know which version of wireless extensions it is
- * (there is some stuff that will be added in the future...)
- * I just plan to increment with each new version.
- */
-        #define WIRELESS_EXT15
-
-/*
- * Changes :
- *
- * V2 to V3
- * --------
-         *Alan Cox start some incompatibles changes. I've integrated a bit more.
-         *- Encryption renamed to Encode to avoid US regulation problems
-         *- Frequency changed from float to struct to avoid problems on old 386
- *
- * V3 to V4
- * --------
-         *- Add sensitivity
- *
- * V4 to V5
- * --------
-         *- Missing encoding definitions in range
-         *- Access points stuff
- *
- * V5 to V6
- * --------
-         *- 802.11 support (ESSID ioctls)
- *
- * V6 to V7
- * --------
-         *- define IW_ESSID_MAX_SIZE and IW_MAX_AP
- *
- * V7 to V8
- * --------
-         *- Changed my e-mail address
-         *- More 802.11 support (nickname, rate, rts, frag)
-         *- List index in frequencies
- *
- * V8 to V9
- * --------
-         *- Support for 'mode of operation' (ad-hoc, managed...)
-         *- Support for unicast and multicast power saving
-         *- Change encoding to support larger tokens (>64 bits)
-         *- Updated iw_params (disable, flags) and use it for NWID
-         *- Extracted iw_point from iwreq for clarity
- *
- * V9 to V10
- * ---------
-         *- Add PM capability to range structure
-         *- Add PM modifier : MAX/MIN/RELATIVE
-         *- Add encoding option : IW_ENCODE_NOKEY
-         *- Add TxPower ioctls (work like TxRate)
- *
- * V10 to V11
- * ----------
-         *- Add WE version in range (help backward/forward compatibility)
-         *- Add retry ioctls (work like PM)
- *
- * V11 to V12
- * ----------
-         *- Add SIOCSIWSTATS to get /proc/net/wireless programatically
-         *- Add DEV PRIVATE IOCTL to avoid collisions in SIOCDEVPRIVATE space
-         *- Add new statistics (frag, retry, beacon)
-         *- Add average quality (for user space calibration)
- *
- * V12 to V13
- * ----------
-         *- Document creation of new driver API.
-         *- Extract union iwreq_data from struct iwreq (for new driver API).
-         *- Rename SIOCSIWNAME as SIOCSIWCOMMIT
- *
- * V13 to V14
- * ----------
-         *- Wireless Events support : define struct iw_event
-         *- Define additional specific event numbers
-         *- Add "addr" and "param" fields in union iwreq_data
-         *- AP scanning stuff (SIOCSIWSCAN and friends)
- *
- * V14 to V15
- * ----------
-         *- Add IW_PRIV_TYPE_ADDR for struct sockaddr private arg
-         *- Make struct iw_freq signed (both m & e), add explicit padding
-         *- Add IWEVCUSTOM for driver specific event/scanning token
-         *- Add IW_MAX_GET_SPY for driver returning a lot of addresses
-         *- Add IW_TXPOW_RANGE for range of Tx Powers
-         *- Add IWEVREGISTERED & IWEVEXPIRED events for Access Points
-         *- Add IW_MODE_MONITOR for passive monitor
- */
-
-/**************************** CONSTANTS ****************************/
-
-/* -------------------------- IOCTL LIST -------------------------- */
-
-/* Wireless Identification */
-        #define SIOCSIWCOMMIT   0x8B00  /* Commit pending changes to driver */
-        #define SIOCGIWNAME     0x8B01  /* get name == wireless protocol */
-/* SIOCGIWNAME is used to verify the presence of Wireless Extensions.
- * Common values : "IEEE 802.11-DS", "IEEE 802.11-FH", "IEEE 802.11b"...
- * Don't put the name of your driver there, it's useless. */
-
-/* Basic operations */
-        #define SIOCSIWNWID     0x8B02  /* set network id (pre-802.11) */
-        #define SIOCGIWNWID     0x8B03  /* get network id (the cell) */
-        #define SIOCSIWFREQ     0x8B04  /* set channel/frequency (Hz) */
-        #define SIOCGIWFREQ     0x8B05  /* get channel/frequency (Hz) */
-        #define SIOCSIWMODE     0x8B06  /* set operation mode */
-        #define SIOCGIWMODE     0x8B07  /* get operation mode */
-        #define SIOCSIWSENS     0x8B08  /* set sensitivity (dBm) */
-        #define SIOCGIWSENS     0x8B09  /* get sensitivity (dBm) */
-
-/* Informative stuff */
-        #define SIOCSIWRANGE    0x8B0A  /* Unused */
-        #define SIOCGIWRANGE    0x8B0B  /* Get range of parameters */
-        #define SIOCSIWPRIV     0x8B0C  /* Unused */
-        #define SIOCGIWPRIV     0x8B0D  /* get private ioctl interface info */
-        #define SIOCSIWSTATS    0x8B0E  /* Unused */
-        #define SIOCGIWSTATS    0x8B0F  /* Get /proc/net/wireless stats */
-/* SIOCGIWSTATS is strictly used between user space and the kernel, and
- * is never passed to the driver (i.e. the driver will never see it). */
-
-/* Mobile IP support (statistics per MAC address) */
-        #define SIOCSIWSPY      0x8B10  /* set spy addresses */
-        #define SIOCGIWSPY      0x8B11  /* get spy info (quality of link) */
-
-/* Access Point manipulation */
-        #define SIOCSIWAP       0x8B14  /* set access point MAC addresses */
-        #define SIOCGIWAP       0x8B15  /* get access point MAC addresses */
-        #define SIOCGIWAPLIST   0x8B17  /* Deprecated in favor of scanning */
-        #define SIOCSIWSCAN     0x8B18  /* trigger scanning (list cells) */
-        #define SIOCGIWSCAN     0x8B19  /* get scanning results */
-
-/* 802.11 specific support */
-        #define SIOCSIWESSID    0x8B1A  /* set ESSID (network name) */
-        #define SIOCGIWESSID    0x8B1B  /* get ESSID */
-        #define SIOCSIWNICKN    0x8B1C  /* set node name/nickname */
-        #define SIOCGIWNICKN    0x8B1D  /* get node name/nickname */
-/* As the ESSID and NICKN are strings up to 32 bytes long, it doesn't fit
- * within the 'iwreq' structure, so we need to use the 'data' member to
- * point to a string in user space, like it is done for RANGE... */
-
-/* Other parameters useful in 802.11 and some other devices */
-        #define SIOCSIWRATE     0x8B20  /* set default bit rate (bps) */
-        #define SIOCGIWRATE     0x8B21  /* get default bit rate (bps) */
-        #define SIOCSIWRTS      0x8B22  /* set RTS/CTS threshold (bytes) */
-        #define SIOCGIWRTS      0x8B23  /* get RTS/CTS threshold (bytes) */
-        #define SIOCSIWFRAG     0x8B24  /* set fragmentation thr (bytes) */
-        #define SIOCGIWFRAG     0x8B25  /* get fragmentation thr (bytes) */
-        #define SIOCSIWTXPOW    0x8B26  /* set transmit power (dBm) */
-        #define SIOCGIWTXPOW    0x8B27  /* get transmit power (dBm) */
-        #define SIOCSIWRETRY    0x8B28  /* set retry limits and lifetime */
-        #define SIOCGIWRETRY    0x8B29  /* get retry limits and lifetime */
-
-/* Encoding stuff (scrambling, hardware security, WEP...) */
-        #define SIOCSIWENCODE   0x8B2A  /* set encoding token & mode */
-        #define SIOCGIWENCODE   0x8B2B  /* get encoding token & mode */
-/* Power saving stuff (power management, unicast and multicast) */
-        #define SIOCSIWPOWER    0x8B2C  /* set Power Management settings */
-        #define SIOCGIWPOWER    0x8B2D  /* get Power Management settings */
-
-/* -------------------- DEV PRIVATE IOCTL LIST -------------------- */
-
-/* These 16 ioctl are wireless device private.
- * Each driver is free to use them for whatever purpose it chooses,
- * however the driver *must* export the description of those ioctls
- * with SIOCGIWPRIV and *must* use arguments as defined below.
- * If you don't follow those rules, DaveM is going to hate you (reason :
- * it make mixed 32/64bit operation impossible).
- */
-        #define SIOCIWFIRSTPRIV0x8BE0
-        #define SIOCIWLASTPRIV0x8BFF
-/* Previously, we were using SIOCDEVPRIVATE, but we now have our
- * separate range because of collisions with other tools such as
- * 'mii-tool'.
- * We now have 32 commands, so a bit more space ;-).
- * Also, all 'odd' commands are only usable by root and don't return the
- * content of ifr/iwr to user (but you are not obliged to use the set/get
- * convention, just use every other two command).
- * And I repeat : you are not obliged to use them with iwspy, but you
- * must be compliant with it.
- */
-
-/* ------------------------- IOCTL STUFF ------------------------- */
-
-/* The first and the last (range) */
-        #define SIOCIWFIRST0x8B00
-        #define SIOCIWLAST      SIOCIWLASTPRIV  /* 0x8BFF */
-
-/* Even : get (world access), odd : set (root access) */
-        #define IW_IS_SET(cmd)(!((cmd) & 0x1))
-        #define IW_IS_GET(cmd)((cmd) & 0x1)
-
-/* ----------------------- WIRELESS EVENTS ----------------------- */
-/* Those are *NOT* ioctls, do not issue request on them !!! */
-/* Most events use the same identifier as ioctl requests */
-
-        #define IWEVTXDROP      0x8C00  /* Packet dropped to excessive retry */
-        #define IWEVQUAL        0x8C01  /* Quality part of statistics (scan) */
-        #define IWEVCUSTOM      0x8C02  /* Driver specific ascii string */
-        #define IWEVREGISTERED  0x8C03  /* Discovered a new node (AP mode) */
-        #define IWEVEXPIRED     0x8C04  /* Expired a node (AP mode) */
-
-        #define IWEVFIRST0x8C00
-
-/* ------------------------- PRIVATE INFO ------------------------- */
-/*
- * The following is used with SIOCGIWPRIV. It allow a driver to define
- * the interface (name, type of data) for its private ioctl.
- * Privates ioctl are SIOCIWFIRSTPRIV -> SIOCIWLASTPRIV
- */
-
-        #define IW_PRIV_TYPE_MASK       0x7000/* Type of arguments */
-        #define IW_PRIV_TYPE_NONE0x0000
-        #define IW_PRIV_TYPE_BYTE       0x1000/* Char as number */
-        #define IW_PRIV_TYPE_CHAR       0x2000/* Char as character */
-        #define IW_PRIV_TYPE_INT        0x4000/* 32 bits int */
-        #define IW_PRIV_TYPE_FLOAT      0x5000/* struct iw_freq */
-        #define IW_PRIV_TYPE_ADDR       0x6000/* struct sockaddr */
-
-        #define IW_PRIV_SIZE_FIXED      0x0800/* Variable or fixed nuber of args */
-
-        #define IW_PRIV_SIZE_MASK       0x07FF/* Max number of those args */
-
-/*
- * Note : if the number of args is fixed and the size < 16 octets,
- * instead of passing a pointer we will put args in the iwreq struct...
- */
-
-/* ----------------------- OTHER CONSTANTS ----------------------- */
-
-/* Maximum frequencies in the range struct */
-        #define IW_MAX_FREQUENCIES16
-/* Note : if you have something like 80 frequencies,
- * don't increase this constant and don't fill the frequency list.
- * The user will be able to set by channel anyway... */
-
-/* Maximum bit rates in the range struct */
-        #define IW_MAX_BITRATES         8
-
-/* Maximum tx powers in the range struct */
-        #define IW_MAX_TXPOWER  8
-/* Note : if you more than 8 TXPowers, just set the max and min or
- * a few of them in the struct iw_range. */
-
-/* Maximum of address that you may set with SPY */
-        #define IW_MAX_SPY              8/* set */
-        #define IW_MAX_GET_SPY          64/* get */
-
-/* Maximum of address that you may get in the
-   list of access points in range */
-        #define IW_MAX_AP       64
-
-/* Maximum size of the ESSID and NICKN strings */
-        #define IW_ESSID_MAX_SIZE32
-
-/* Modes of operation */
-        #define IW_MODE_AUTO    0/* Let the driver decides */
-        #define IW_MODE_ADHOC   1/* Single cell network */
-        #define IW_MODE_INFRA   2/* Multi cell network, roaming, ... */
-        #define IW_MODE_MASTER  3/* Synchronisation master or Access Point */
-        #define IW_MODE_REPEAT  4/* Wireless Repeater (forwarder) */
-        #define IW_MODE_SECOND  5/* Secondary master/repeater (backup) */
-        #define IW_MODE_MONITOR         6/* Passive monitor (listen only) */
-
-/* Maximum number of size of encoding token available
- * they are listed in the range structure */
-        #define IW_MAX_ENCODING_SIZES8
-
-/* Maximum size of the encoding token in bytes */
-        #define IW_ENCODING_TOKEN_MAX   32/* 256 bits (for now) */
-
-/* Flags for encoding (along with the token) */
-        #define IW_ENCODE_INDEX                 0x00FF/* Token index (if needed) */
-        #define IW_ENCODE_FLAGS                 0xFF00/* Flags defined below */
-        #define IW_ENCODE_MODE          0xF000/* Modes defined below */
-        #define IW_ENCODE_DISABLED      0x8000/* Encoding disabled */
-        #define IW_ENCODE_ENABLED       0x0000/* Encoding enabled */
-        #define IW_ENCODE_RESTRICTED    0x4000/* Refuse non-encoded packets */
-        #define IW_ENCODE_OPEN          0x2000/* Accept non-encoded packets */
-#define IW_ENCODE_NOKEY         0x0800  /* Key is write only, so not present */
-
-/* Power management flags available (along with the value, if any) */
-        #define IW_POWER_ON             0x0000/* No details... */
-        #define IW_POWER_TYPE           0xF000/* Type of parameter */
-        #define IW_POWER_PERIOD                 0x1000/* Value is a period/duration of  */
-        #define IW_POWER_TIMEOUT        0x2000/* Value is a timeout (to go asleep) */
-        #define IW_POWER_MODE           0x0F00/* Power Management mode */
-        #define IW_POWER_UNICAST_R      0x0100/* Receive only unicast messages */
-        #define IW_POWER_MULTICAST_R    0x0200/* Receive only multicast messages */
-        #define IW_POWER_ALL_R          0x0300/* Receive all messages though PM */
-        #define IW_POWER_FORCE_S        0x0400/* Force PM procedure for sending unicast */
-        #define IW_POWER_REPEATER       0x0800/* Repeat broadcast messages in PM period */
-        #define IW_POWER_MODIFIER       0x000F/* Modify a parameter */
-        #define IW_POWER_MIN            0x0001/* Value is a minimum  */
-        #define IW_POWER_MAX            0x0002/* Value is a maximum */
-        #define IW_POWER_RELATIVE       0x0004/* Value is not in seconds/ms/us */
-
-/* Transmit Power flags available */
-        #define IW_TXPOW_TYPE           0x00FF/* Type of value */
-        #define IW_TXPOW_DBM            0x0000/* Value is in dBm */
-        #define IW_TXPOW_MWATT          0x0001/* Value is in mW */
-        #define IW_TXPOW_RANGE          0x1000/* Range of value between min/max */
-
-/* Retry limits and lifetime flags available */
-        #define IW_RETRY_ON             0x0000/* No details... */
-        #define IW_RETRY_TYPE           0xF000/* Type of parameter */
-        #define IW_RETRY_LIMIT          0x1000/* Maximum number of retries*/
-        #define IW_RETRY_LIFETIME       0x2000/* Maximum duration of retries in us */
-        #define IW_RETRY_MODIFIER       0x000F/* Modify a parameter */
-        #define IW_RETRY_MIN            0x0001/* Value is a minimum  */
-        #define IW_RETRY_MAX            0x0002/* Value is a maximum */
-        #define IW_RETRY_RELATIVE       0x0004/* Value is not in seconds/ms/us */
-
-/* Scanning request flags */
-        #define IW_SCAN_DEFAULT                 0x0000/* Default scan of the driver */
-        #define IW_SCAN_ALL_ESSID       0x0001/* Scan all ESSIDs */
-        #define IW_SCAN_THIS_ESSID      0x0002/* Scan only this ESSID */
-        #define IW_SCAN_ALL_FREQ        0x0004/* Scan all Frequencies */
-        #define IW_SCAN_THIS_FREQ       0x0008/* Scan only this Frequency */
-        #define IW_SCAN_ALL_MODE        0x0010/* Scan all Modes */
-        #define IW_SCAN_THIS_MODE       0x0020/* Scan only this Mode */
-        #define IW_SCAN_ALL_RATE        0x0040/* Scan all Bit-Rates */
-        #define IW_SCAN_THIS_RATE       0x0080/* Scan only this Bit-Rate */
-/* Maximum size of returned data */
-        #define IW_SCAN_MAX_DATA        4096/* In bytes */
-
-/* Max number of char in custom event - use multiple of them if needed */
-        #define IW_CUSTOM_MAX           256/* In bytes */
-
-/****************************** TYPES ******************************/
-
-/* --------------------------- SUBTYPES --------------------------- */
-/*
-         *Generic format for most parameters that fit in an int
- */
-        structiw_param
-{
-          __s32                 value;  /* The value of the parameter itself */
-          __u8          fixed;  /* Hardware should not use auto select */
-          __u8          disabled;/* Disable the feature */
-          __u16                 flags;  /* Various specifc flags (if any) */
-};
-
-/*
-         *For all data larger than 16 octets, we need to use a
-         *pointer to memory allocated in user space.
- */
-        structiw_point
-{
-          caddr_t       pointer;/* Pointer to the data  (in user space) */
-          __u16                 length;         /* number of fields or size in bytes */
-          __u16                 flags;  /* Optional params */
-};
-
-/*
-         *A frequency
-         *For numbers lower than 10^9, we encode the number in 'm' and
-         *set 'e' to 0
-         *For number greater than 10^9, we divide it by the lowest power
-         *of 10 to get 'm' lower than 10^9, with 'm'= f / (10^'e')...
-         *The power of 10 is in 'e', the result of the division is in 'm'.
- */
-        structiw_freq
-{
-                __s32           m;      /* Mantissa */
-                __s16           e;      /* Exponent */
-                __u8            i;      /* List index (when in range struct) */
-                __u8            pad;    /* Unused - just for alignement */
-};
-
-/*
-         *Quality of the link
- */
-        structiw_quality
-{
-                __u8            qual;   /* link quality (%retries, SNR,
-                                           %missed beacons or better...) */
-                __u8            level;  /* signal level (dBm) */
-                __u8            noise;  /* noise level (dBm) */
-                __u8            updated;/* Flags to know if updated */
-};
-
-/*
-         *Packet discarded in the wireless adapter due to
-         *"wireless" specific problems...
-         *Note : the list of counter and statistics in net_device_stats
-         *is already pretty exhaustive, and you should use that first.
-         *This is only additional stats...
- */
-        structiw_discarded
-{
-                __u32           nwid;   /* Rx : Wrong nwid/essid */
-                __u32           code;   /* Rx : Unable to code/decode (WEP) */
-                __u32           fragment;/* Rx : Can't perform MAC reassembly */
-                __u32           retries;/* Tx : Max MAC retries num reached */
-                __u32           misc;   /* Others cases */
-};
-
-/*
-         *Packet/Time period missed in the wireless adapter due to
-         *"wireless" specific problems...
- */
-        structiw_missed
-{
-                __u32           beacon;         /* Missed beacons/superframe */
-};
-
-/* ------------------------ WIRELESS STATS ------------------------ */
-/*
- * Wireless statistics (used for /proc/net/wireless)
- */
-        structiw_statistics
-{
-                __u16           status;         /* Status
-                                         * - device dependent for now */
-
-                struct iw_quality       qual;   /* Quality of the link
-                                                 * (instant/mean/max) */
-                struct iw_discarded     discard;/* Packet discarded counts */
-                struct iw_missed        miss;   /* Packet missed counts */
-};
-
-/* ------------------------ IOCTL REQUEST ------------------------ */
-/*
- * This structure defines the payload of an ioctl, and is used 
- * below.
- *
- * Note that this structure should fit on the memory footprint
- * of iwreq (which is the same as ifreq), which mean a max size of
- * 16 octets = 128 bits. Warning, pointers might be 64 bits wide...
- * You should check this when increasing the structures defined
- * above in this file...
- */
-        unioniwreq_data
-{
-        /* Config - generic */
-                char    name[IFNAMSIZ];
-        /* Name : used to verify the presence of  wireless extensions.
-         * Name of the protocol/provider... */
-
-                struct iw_point         essid;  /* Extended network name */
-                struct iw_param         nwid;   /* network id (or domain - the cell) */
-                struct iw_freq  freq;   /* frequency or channel :
-                                         * 0-1000 = channel
-                                         * > 1000 = frequency in Hz */
-
-                struct iw_param         sens;   /* signal level threshold */
-                struct iw_param         bitrate;/* default bit rate */
-                struct iw_param         txpower;/* default transmit power */
-                struct iw_param         rts;    /* RTS threshold threshold */
-                struct iw_param         frag;   /* Fragmentation threshold */
-                __u32           mode;   /* Operation mode */
-                struct iw_param         retry;  /* Retry limits & lifetime */
-
-                struct iw_point         encoding;/* Encoding stuff : tokens */
-                struct iw_param         power;  /* PM duration/timeout */
-                struct iw_quality qual;         /* Quality part of statistics */
-
-                struct sockaddr         ap_addr;/* Access point address */
-                struct sockaddr         addr;   /* Destination address (hw) */
-
-                struct iw_param         param;  /* Other small parameters */
-                struct iw_point         data;   /* Other large parameters */
-};
-
-/*
- * The structure to exchange data for ioctl.
- * This structure is the same as 'struct ifreq', but (re)defined for
- * convenience...
- * Do I need to remind you about structure size (32 octets) ?
- */
-        structiwreq
-{
-        union
-        {
-                        char    ifrn_name[IFNAMSIZ];/* if name, e.g. "eth0" */
-        } ifr_ifrn;
-
-        /* Data part (defined just above) */
-                union   iwreq_datau;
-};
-
-/* -------------------------- IOCTL DATA -------------------------- */
-/*
-         *For those ioctl which want to exchange mode data that what could
-         *fit in the above structure...
- */
-
-/*
-         *Range of parameters
- */
-
-        structiw_range
-{
-        /* Informative stuff (to choose between different interface) */
-                __u32           throughput;/* To give an idea... */
-        /* In theory this value should be the maximum benchmarked
-         * TCP/IP throughput, because with most of these devices the
-         * bit rate is meaningless (overhead an co) to estimate how
-         * fast the connection will go and pick the fastest one.
-         * I suggest people to play with Netperf or any benchmark...
-         */
-
-        /* NWID (or domain id) */
-                __u32           min_nwid;/* Minimal NWID we are able to set */
-                __u32           max_nwid;/* Maximal NWID we are able to set */
-
-        /* Frequency */
-                __u16           num_channels;/* Number of channels [0; num - 1] */
-                __u8            num_frequency;/* Number of entry in the list */
-                struct iw_freq  freq[IW_MAX_FREQUENCIES];/* list */
-        /* Note : this frequency list doesn't need to fit channel numbers */
-
-        /* signal level threshold range */
-                __s32sensitivity;
-
-        /* Quality of link & SNR stuff */
-                struct iw_quality       max_qual;/* Quality of the link */
-
-        /* Rates */
-                __u8            num_bitrates;/* Number of entries in the list */
-                __s32           bitrate[IW_MAX_BITRATES];/* list, in bps */
-
-        /* RTS threshold */
-                __s32           min_rts;/* Minimal RTS threshold */
-                __s32           max_rts;/* Maximal RTS threshold */
-
-        /* Frag threshold */
-                __s32           min_frag;/* Minimal frag threshold */
-                __s32           max_frag;/* Maximal frag threshold */
-
-        /* Power Management duration & timeout */
-                __s32           min_pmp;/* Minimal PM period */
-                __s32           max_pmp;/* Maximal PM period */
-                __s32           min_pmt;/* Minimal PM timeout */
-                __s32           max_pmt;/* Maximal PM timeout */
-                __u16           pmp_flags;/* How to decode max/min PM period */
-                __u16           pmt_flags;/* How to decode max/min PM timeout */
-                __u16           pm_capa;/* What PM options are supported */
-
-        /* Encoder stuff */
-                __u16   encoding_size[IW_MAX_ENCODING_SIZES];/* Different token sizes */
-                __u8    num_encoding_sizes;/* Number of entry in the list */
-                __u8    max_encoding_tokens;/* Max number of tokens */
-
-        /* Transmit power */
-                __u16           txpower_capa;/* What options are supported */
-                __u8            num_txpower;/* Number of entries in the list */
-                __s32           txpower[IW_MAX_TXPOWER];/* list, in bps */
-
-        /* Wireless Extension version info */
-                __u8            we_version_compiled;/* Must be WIRELESS_EXT */
-                __u8            we_version_source;/* Last update of source */
-
-        /* Retry limits and lifetime */
-                __u16           retry_capa;/* What retry options are supported */
-                __u16           retry_flags;/* How to decode max/min retry limit */
-                __u16           r_time_flags;/* How to decode max/min retry life */
-                __s32           min_retry;/* Minimal number of retries */
-                __s32           max_retry;/* Maximal number of retries */
-                __s32           min_r_time;/* Minimal retry lifetime */
-                __s32           max_r_time;/* Maximal retry lifetime */
-
-        /* Average quality of link & SNR */
-                struct iw_quality       avg_qual;/* Quality of the link */
-        /* This should contain the average/typical values of the quality
-         * indicator. This should be the threshold between a "good" and
-         * a "bad" link (example : monitor going from green to orange).
-         * Currently, user space apps like quality monitors don't have any
-         * way to calibrate the measurement. With this, they can split
-         * the range between 0 and max_qual in different quality level
-         * (using a geometric subdivision centered on the average).
-         * I expect that people doing the user space apps will feedback
-         * us on which value we need to put in each driver...
-         */
-};
-
-/*
- * Private ioctl interface information
- */
- 
-        structiw_priv_args
-{
-                __u32           cmd;    /* Number of the ioctl to issue */
-                __u16           set_args;/* Type and number of args */
-                __u16           get_args;/* Type and number of args */
-                char            name[IFNAMSIZ];/* Name of the extension */
-};
-
-/* ----------------------- WIRELESS EVENTS ----------------------- */
-/*
- * Wireless events are carried through the rtnetlink socket to user
- * space. They are encapsulated in the IFLA_WIRELESS field of
- * a RTM_NEWLINK message.
- */
-
-/*
- * A Wireless Event. Contains basically the same data as the ioctl...
- */
-struct iw_event
-{
-                __u16           len;            /* Real lenght of this stuff */
-                __u16           cmd;            /* Wireless IOCTL */
-                union iwreq_data        u;      /* IOCTL fixed payload */
-};
-
-/* Size of the Event prefix (including padding and alignement junk) */
-        #define IW_EV_LCP_LEN(sizeof(struct iw_event) - sizeof(union iwreq_data))
-/* Size of the various events */
-        #define IW_EV_CHAR_LEN(IW_EV_LCP_LEN + IFNAMSIZ)
-        #define IW_EV_UINT_LEN(IW_EV_LCP_LEN + sizeof(__u32))
-        #define IW_EV_FREQ_LEN(IW_EV_LCP_LEN + sizeof(struct iw_freq))
-        #define IW_EV_POINT_LEN(IW_EV_LCP_LEN + sizeof(struct iw_point))
-        #define IW_EV_PARAM_LEN(IW_EV_LCP_LEN + sizeof(struct iw_param))
-        #define IW_EV_ADDR_LEN(IW_EV_LCP_LEN + sizeof(struct sockaddr))
-        #define IW_EV_QUAL_LEN(IW_EV_LCP_LEN + sizeof(struct iw_quality))
-
-/* Note : in the case of iw_point, the extra data will come at the
- * end of the event */
-
-        #endif/* _LINUX_WIRELESS_H */
diff --git a/libopie2/opienet/wireless.16.h b/libopie2/opienet/wireless.16.h
deleted file mode 100644
index 9a9accd..0000000
--- a/libopie2/opienet/wireless.16.h
+++ b/dev/null
@@ -1,740 +0,0 @@
-/*
- * This file define a set of standard wireless extensions
- *
-         * Version :    162.4.03
- *
-         * Authors :Jean Tourrilhes - HPL - <jt@hpl.hp.com>
- * Copyright (c) 1997-2002 Jean Tourrilhes, All Rights Reserved.
- */
-
-#ifndef _LINUX_WIRELESS_H
-#define _LINUX_WIRELESS_H
-
-/************************** DOCUMENTATION **************************/
-/*
- * Initial APIs (1996 -> onward) :
- * -----------------------------
- * Basically, the wireless extensions are for now a set of standard ioctl
- * call + /proc/net/wireless
- *
- * The entry /proc/net/wireless give statistics and information on the
- * driver.
- * This is better than having each driver having its entry because
- * its centralised and we may remove the driver module safely.
- *
- * Ioctl are used to configure the driver and issue commands.  This is
- * better than command line options of insmod because we may want to
- * change dynamically (while the driver is running) some parameters.
- *
- * The ioctl mechanimsm are copied from standard devices ioctl.
- * We have the list of command plus a structure descibing the
- * data exchanged...
- * Note that to add these ioctl, I was obliged to modify :
-         *# net/core/dev.c (two place + add include)
-         *# net/ipv4/af_inet.c (one place + add include)
- *
- * /proc/net/wireless is a copy of /proc/net/dev.
- * We have a structure for data passed from the driver to /proc/net/wireless
- * Too add this, I've modified :
-         *# net/core/dev.c (two other places)
-         *# include/linux/netdevice.h (one place)
-         *# include/linux/proc_fs.h (one place)
- *
- * New driver API (2002 -> onward) :
- * -------------------------------
- * This file is only concerned with the user space API and common definitions.
- * The new driver API is defined and documented in :
-         *# include/net/iw_handler.h
- *
- * Note as well that /proc/net/wireless implementation has now moved in :
-         *# include/linux/wireless.c
- *
- * Wireless Events (2002 -> onward) :
- * --------------------------------
- * Events are defined at the end of this file, and implemented in :
-         *# include/linux/wireless.c
- *
- * Other comments :
- * --------------
- * Do not add here things that are redundant with other mechanisms
- * (drivers init, ifconfig, /proc/net/dev, ...) and with are not
- * wireless specific.
- *
- * These wireless extensions are not magic : each driver has to provide
- * support for them...
- *
- * IMPORTANT NOTE : As everything in the kernel, this is very much a
- * work in progress. Contact me if you have ideas of improvements...
- */
-
-/***************************** INCLUDES *****************************/
-
-/* To minimise problems in user space, I might remove those headers
- * at some point. Jean II */
-#include <sys/types.h>
-#include <net/if.h>
-#include <linux/types.h>
-
-#ifndef IFNAMSIZ
-#define IFNAMSIZ 16
-#endif
-#ifndef IW_MAX_PRIV_DEF
-#define IW_MAX_PRIV_DEF        128
-#endif
-
-/***************************** VERSION *****************************/
-/*
- * This constant is used to know the availability of the wireless
- * extensions and to know which version of wireless extensions it is
- * (there is some stuff that will be added in the future...)
- * I just plan to increment with each new version.
- */
-        #define WIRELESS_EXT16
-
-/*
- * Changes :
- *
- * V2 to V3
- * --------
-         *Alan Cox start some incompatibles changes. I've integrated a bit more.
-         *- Encryption renamed to Encode to avoid US regulation problems
-         *- Frequency changed from float to struct to avoid problems on old 386
- *
- * V3 to V4
- * --------
-         *- Add sensitivity
- *
- * V4 to V5
- * --------
-         *- Missing encoding definitions in range
-         *- Access points stuff
- *
- * V5 to V6
- * --------
-         *- 802.11 support (ESSID ioctls)
- *
- * V6 to V7
- * --------
-         *- define IW_ESSID_MAX_SIZE and IW_MAX_AP
- *
- * V7 to V8
- * --------
-         *- Changed my e-mail address
-         *- More 802.11 support (nickname, rate, rts, frag)
-         *- List index in frequencies
- *
- * V8 to V9
- * --------
-         *- Support for 'mode of operation' (ad-hoc, managed...)
-         *- Support for unicast and multicast power saving
-         *- Change encoding to support larger tokens (>64 bits)
-         *- Updated iw_params (disable, flags) and use it for NWID
-         *- Extracted iw_point from iwreq for clarity
- *
- * V9 to V10
- * ---------
-         *- Add PM capability to range structure
-         *- Add PM modifier : MAX/MIN/RELATIVE
-         *- Add encoding option : IW_ENCODE_NOKEY
-         *- Add TxPower ioctls (work like TxRate)
- *
- * V10 to V11
- * ----------
-         *- Add WE version in range (help backward/forward compatibility)
-         *- Add retry ioctls (work like PM)
- *
- * V11 to V12
- * ----------
-         *- Add SIOCSIWSTATS to get /proc/net/wireless programatically
-         *- Add DEV PRIVATE IOCTL to avoid collisions in SIOCDEVPRIVATE space
-         *- Add new statistics (frag, retry, beacon)
-         *- Add average quality (for user space calibration)
- *
- * V12 to V13
- * ----------
-         *- Document creation of new driver API.
-         *- Extract union iwreq_data from struct iwreq (for new driver API).
-         *- Rename SIOCSIWNAME as SIOCSIWCOMMIT
- *
- * V13 to V14
- * ----------
-         *- Wireless Events support : define struct iw_event
-         *- Define additional specific event numbers
-         *- Add "addr" and "param" fields in union iwreq_data
-         *- AP scanning stuff (SIOCSIWSCAN and friends)
- *
- * V14 to V15
- * ----------
-         *- Add IW_PRIV_TYPE_ADDR for struct sockaddr private arg
-         *- Make struct iw_freq signed (both m & e), add explicit padding
-         *- Add IWEVCUSTOM for driver specific event/scanning token
-         *- Add IW_MAX_GET_SPY for driver returning a lot of addresses
-         *- Add IW_TXPOW_RANGE for range of Tx Powers
-         *- Add IWEVREGISTERED & IWEVEXPIRED events for Access Points
-         *- Add IW_MODE_MONITOR for passive monitor
- *
- * V15 to V16
- * ----------
-         *- Increase the number of bitrates in iw_range to 32 (for 802.11g)
-         *- Increase the number of frequencies in iw_range to 32 (for 802.11b+a)
-         *- Reshuffle struct iw_range for increases, add filler
-         *- Increase IW_MAX_AP to 64 for driver returning a lot of addresses
-         *- Remove IW_MAX_GET_SPY because conflict with enhanced spy support
-         *- Add SIOCSIWTHRSPY/SIOCGIWTHRSPY and "struct iw_thrspy"
-         *- Add IW_ENCODE_TEMP and iw_range->encoding_login_index
- */
-
-/**************************** CONSTANTS ****************************/
-
-/* -------------------------- IOCTL LIST -------------------------- */
-
-/* Wireless Identification */
-        #define SIOCSIWCOMMIT   0x8B00  /* Commit pending changes to driver */
-        #define SIOCGIWNAME     0x8B01  /* get name == wireless protocol */
-/* SIOCGIWNAME is used to verify the presence of Wireless Extensions.
- * Common values : "IEEE 802.11-DS", "IEEE 802.11-FH", "IEEE 802.11b"...
- * Don't put the name of your driver there, it's useless. */
-
-/* Basic operations */
-        #define SIOCSIWNWID     0x8B02  /* set network id (pre-802.11) */
-        #define SIOCGIWNWID     0x8B03  /* get network id (the cell) */
-        #define SIOCSIWFREQ     0x8B04  /* set channel/frequency (Hz) */
-        #define SIOCGIWFREQ     0x8B05  /* get channel/frequency (Hz) */
-        #define SIOCSIWMODE     0x8B06  /* set operation mode */
-        #define SIOCGIWMODE     0x8B07  /* get operation mode */
-        #define SIOCSIWSENS     0x8B08  /* set sensitivity (dBm) */
-        #define SIOCGIWSENS     0x8B09  /* get sensitivity (dBm) */
-
-/* Informative stuff */
-        #define SIOCSIWRANGE    0x8B0A  /* Unused */
-        #define SIOCGIWRANGE    0x8B0B  /* Get range of parameters */
-        #define SIOCSIWPRIV     0x8B0C  /* Unused */
-        #define SIOCGIWPRIV     0x8B0D  /* get private ioctl interface info */
-        #define SIOCSIWSTATS    0x8B0E  /* Unused */
-        #define SIOCGIWSTATS    0x8B0F  /* Get /proc/net/wireless stats */
-/* SIOCGIWSTATS is strictly used between user space and the kernel, and
- * is never passed to the driver (i.e. the driver will never see it). */
-
-/* Spy support (statistics per MAC address - used for Mobile IP support) */
-        #define SIOCSIWSPY      0x8B10  /* set spy addresses */
-        #define SIOCGIWSPY      0x8B11  /* get spy info (quality of link) */
-        #define SIOCSIWTHRSPY   0x8B12  /* set spy threshold (spy event) */
-        #define SIOCGIWTHRSPY   0x8B13  /* get spy threshold */
-
-/* Access Point manipulation */
-        #define SIOCSIWAP       0x8B14  /* set access point MAC addresses */
-        #define SIOCGIWAP       0x8B15  /* get access point MAC addresses */
-        #define SIOCGIWAPLIST   0x8B17  /* Deprecated in favor of scanning */
-        #define SIOCSIWSCAN     0x8B18  /* trigger scanning (list cells) */
-        #define SIOCGIWSCAN     0x8B19  /* get scanning results */
-
-/* 802.11 specific support */
-        #define SIOCSIWESSID    0x8B1A  /* set ESSID (network name) */
-        #define SIOCGIWESSID    0x8B1B  /* get ESSID */
-        #define SIOCSIWNICKN    0x8B1C  /* set node name/nickname */
-        #define SIOCGIWNICKN    0x8B1D  /* get node name/nickname */
-/* As the ESSID and NICKN are strings up to 32 bytes long, it doesn't fit
- * within the 'iwreq' structure, so we need to use the 'data' member to
- * point to a string in user space, like it is done for RANGE... */
-
-/* Other parameters useful in 802.11 and some other devices */
-        #define SIOCSIWRATE     0x8B20  /* set default bit rate (bps) */
-        #define SIOCGIWRATE     0x8B21  /* get default bit rate (bps) */
-        #define SIOCSIWRTS      0x8B22  /* set RTS/CTS threshold (bytes) */
-        #define SIOCGIWRTS      0x8B23  /* get RTS/CTS threshold (bytes) */
-        #define SIOCSIWFRAG     0x8B24  /* set fragmentation thr (bytes) */
-        #define SIOCGIWFRAG     0x8B25  /* get fragmentation thr (bytes) */
-        #define SIOCSIWTXPOW    0x8B26  /* set transmit power (dBm) */
-        #define SIOCGIWTXPOW    0x8B27  /* get transmit power (dBm) */
-        #define SIOCSIWRETRY    0x8B28  /* set retry limits and lifetime */
-        #define SIOCGIWRETRY    0x8B29  /* get retry limits and lifetime */
-
-/* Encoding stuff (scrambling, hardware security, WEP...) */
-        #define SIOCSIWENCODE   0x8B2A  /* set encoding token & mode */
-        #define SIOCGIWENCODE   0x8B2B  /* get encoding token & mode */
-/* Power saving stuff (power management, unicast and multicast) */
-        #define SIOCSIWPOWER    0x8B2C  /* set Power Management settings */
-        #define SIOCGIWPOWER    0x8B2D  /* get Power Management settings */
-
-/* -------------------- DEV PRIVATE IOCTL LIST -------------------- */
-
-/* These 16 ioctl are wireless device private.
- * Each driver is free to use them for whatever purpose it chooses,
- * however the driver *must* export the description of those ioctls
- * with SIOCGIWPRIV and *must* use arguments as defined below.
- * If you don't follow those rules, DaveM is going to hate you (reason :
- * it make mixed 32/64bit operation impossible).
- */
-        #define SIOCIWFIRSTPRIV0x8BE0
-        #define SIOCIWLASTPRIV0x8BFF
-/* Previously, we were using SIOCDEVPRIVATE, but we now have our
- * separate range because of collisions with other tools such as
- * 'mii-tool'.
- * We now have 32 commands, so a bit more space ;-).
- * Also, all 'odd' commands are only usable by root and don't return the
- * content of ifr/iwr to user (but you are not obliged to use the set/get
- * convention, just use every other two command).
- * And I repeat : you are not obliged to use them with iwspy, but you
- * must be compliant with it.
- */
-
-/* ------------------------- IOCTL STUFF ------------------------- */
-
-/* The first and the last (range) */
-        #define SIOCIWFIRST0x8B00
-        #define SIOCIWLAST      SIOCIWLASTPRIV  /* 0x8BFF */
-
-/* Even : get (world access), odd : set (root access) */
-        #define IW_IS_SET(cmd)(!((cmd) & 0x1))
-        #define IW_IS_GET(cmd)((cmd) & 0x1)
-
-/* ----------------------- WIRELESS EVENTS ----------------------- */
-/* Those are *NOT* ioctls, do not issue request on them !!! */
-/* Most events use the same identifier as ioctl requests */
-
-        #define IWEVTXDROP      0x8C00  /* Packet dropped to excessive retry */
-        #define IWEVQUAL        0x8C01  /* Quality part of statistics (scan) */
-        #define IWEVCUSTOM      0x8C02  /* Driver specific ascii string */
-        #define IWEVREGISTERED  0x8C03  /* Discovered a new node (AP mode) */
-        #define IWEVEXPIRED     0x8C04  /* Expired a node (AP mode) */
-
-        #define IWEVFIRST0x8C00
-
-/* ------------------------- PRIVATE INFO ------------------------- */
-/*
- * The following is used with SIOCGIWPRIV. It allow a driver to define
- * the interface (name, type of data) for its private ioctl.
- * Privates ioctl are SIOCIWFIRSTPRIV -> SIOCIWLASTPRIV
- */
-
-        #define IW_PRIV_TYPE_MASK       0x7000/* Type of arguments */
-        #define IW_PRIV_TYPE_NONE0x0000
-        #define IW_PRIV_TYPE_BYTE       0x1000/* Char as number */
-        #define IW_PRIV_TYPE_CHAR       0x2000/* Char as character */
-        #define IW_PRIV_TYPE_INT        0x4000/* 32 bits int */
-        #define IW_PRIV_TYPE_FLOAT      0x5000/* struct iw_freq */
-        #define IW_PRIV_TYPE_ADDR       0x6000/* struct sockaddr */
-
-        #define IW_PRIV_SIZE_FIXED      0x0800/* Variable or fixed number of args */
-
-        #define IW_PRIV_SIZE_MASK       0x07FF/* Max number of those args */
-
-/*
- * Note : if the number of args is fixed and the size < 16 octets,
- * instead of passing a pointer we will put args in the iwreq struct...
- */
-
-/* ----------------------- OTHER CONSTANTS ----------------------- */
-
-/* Maximum frequencies in the range struct */
-        #define IW_MAX_FREQUENCIES32
-/* Note : if you have something like 80 frequencies,
- * don't increase this constant and don't fill the frequency list.
- * The user will be able to set by channel anyway... */
-
-/* Maximum bit rates in the range struct */
-        #define IW_MAX_BITRATES         32
-
-/* Maximum tx powers in the range struct */
-        #define IW_MAX_TXPOWER  8
-/* Note : if you more than 8 TXPowers, just set the max and min or
- * a few of them in the struct iw_range. */
-
-/* Maximum of address that you may set with SPY */
-        #define IW_MAX_SPY      8
-
-/* Maximum of address that you may get in the
-   list of access points in range */
-        #define IW_MAX_AP       64
-
-/* Maximum size of the ESSID and NICKN strings */
-        #define IW_ESSID_MAX_SIZE32
-
-/* Modes of operation */
-        #define IW_MODE_AUTO    0/* Let the driver decides */
-        #define IW_MODE_ADHOC   1/* Single cell network */
-        #define IW_MODE_INFRA   2/* Multi cell network, roaming, ... */
-        #define IW_MODE_MASTER  3/* Synchronisation master or Access Point */
-        #define IW_MODE_REPEAT  4/* Wireless Repeater (forwarder) */
-        #define IW_MODE_SECOND  5/* Secondary master/repeater (backup) */
-        #define IW_MODE_MONITOR         6/* Passive monitor (listen only) */
-
-/* Maximum number of size of encoding token available
- * they are listed in the range structure */
-        #define IW_MAX_ENCODING_SIZES8
-
-/* Maximum size of the encoding token in bytes */
-        #define IW_ENCODING_TOKEN_MAX   32/* 256 bits (for now) */
-
-/* Flags for encoding (along with the token) */
-        #define IW_ENCODE_INDEX                 0x00FF/* Token index (if needed) */
-        #define IW_ENCODE_FLAGS                 0xFF00/* Flags defined below */
-        #define IW_ENCODE_MODE          0xF000/* Modes defined below */
-        #define IW_ENCODE_DISABLED      0x8000/* Encoding disabled */
-        #define IW_ENCODE_ENABLED       0x0000/* Encoding enabled */
-        #define IW_ENCODE_RESTRICTED    0x4000/* Refuse non-encoded packets */
-        #define IW_ENCODE_OPEN          0x2000/* Accept non-encoded packets */
-        #define IW_ENCODE_NOKEY         0x0800  /* Key is write only, so not present */
-        #define IW_ENCODE_TEMP  0x0400  /* Temporary key */
-
-/* Power management flags available (along with the value, if any) */
-        #define IW_POWER_ON             0x0000/* No details... */
-        #define IW_POWER_TYPE           0xF000/* Type of parameter */
-        #define IW_POWER_PERIOD                 0x1000/* Value is a period/duration of  */
-        #define IW_POWER_TIMEOUT        0x2000/* Value is a timeout (to go asleep) */
-        #define IW_POWER_MODE           0x0F00/* Power Management mode */
-        #define IW_POWER_UNICAST_R      0x0100/* Receive only unicast messages */
-        #define IW_POWER_MULTICAST_R    0x0200/* Receive only multicast messages */
-        #define IW_POWER_ALL_R          0x0300/* Receive all messages though PM */
-        #define IW_POWER_FORCE_S        0x0400/* Force PM procedure for sending unicast */
-        #define IW_POWER_REPEATER       0x0800/* Repeat broadcast messages in PM period */
-        #define IW_POWER_MODIFIER       0x000F/* Modify a parameter */
-        #define IW_POWER_MIN            0x0001/* Value is a minimum  */
-        #define IW_POWER_MAX            0x0002/* Value is a maximum */
-        #define IW_POWER_RELATIVE       0x0004/* Value is not in seconds/ms/us */
-
-/* Transmit Power flags available */
-        #define IW_TXPOW_TYPE           0x00FF/* Type of value */
-        #define IW_TXPOW_DBM            0x0000/* Value is in dBm */
-        #define IW_TXPOW_MWATT          0x0001/* Value is in mW */
-        #define IW_TXPOW_RANGE          0x1000/* Range of value between min/max */
-
-/* Retry limits and lifetime flags available */
-        #define IW_RETRY_ON             0x0000/* No details... */
-        #define IW_RETRY_TYPE           0xF000/* Type of parameter */
-        #define IW_RETRY_LIMIT          0x1000/* Maximum number of retries*/
-        #define IW_RETRY_LIFETIME       0x2000/* Maximum duration of retries in us */
-        #define IW_RETRY_MODIFIER       0x000F/* Modify a parameter */
-        #define IW_RETRY_MIN            0x0001/* Value is a minimum  */
-        #define IW_RETRY_MAX            0x0002/* Value is a maximum */
-        #define IW_RETRY_RELATIVE       0x0004/* Value is not in seconds/ms/us */
-
-/* Scanning request flags */
-        #define IW_SCAN_DEFAULT                 0x0000/* Default scan of the driver */
-        #define IW_SCAN_ALL_ESSID       0x0001/* Scan all ESSIDs */
-        #define IW_SCAN_THIS_ESSID      0x0002/* Scan only this ESSID */
-        #define IW_SCAN_ALL_FREQ        0x0004/* Scan all Frequencies */
-        #define IW_SCAN_THIS_FREQ       0x0008/* Scan only this Frequency */
-        #define IW_SCAN_ALL_MODE        0x0010/* Scan all Modes */
-        #define IW_SCAN_THIS_MODE       0x0020/* Scan only this Mode */
-        #define IW_SCAN_ALL_RATE        0x0040/* Scan all Bit-Rates */
-        #define IW_SCAN_THIS_RATE       0x0080/* Scan only this Bit-Rate */
-/* Maximum size of returned data */
-        #define IW_SCAN_MAX_DATA        4096/* In bytes */
-
-/* Max number of char in custom event - use multiple of them if needed */
-        #define IW_CUSTOM_MAX           256/* In bytes */
-
-/****************************** TYPES ******************************/
-
-/* --------------------------- SUBTYPES --------------------------- */
-/*
-         *Generic format for most parameters that fit in an int
- */
-        structiw_param
-{
-          __s32                 value;  /* The value of the parameter itself */
-          __u8          fixed;  /* Hardware should not use auto select */
-          __u8          disabled;/* Disable the feature */
-          __u16                 flags;  /* Various specifc flags (if any) */
-};
-
-/*
-         *For all data larger than 16 octets, we need to use a
-         *pointer to memory allocated in user space.
- */
-        structiw_point
-{
-          caddr_t       pointer;/* Pointer to the data  (in user space) */
-          __u16                 length;         /* number of fields or size in bytes */
-          __u16                 flags;  /* Optional params */
-};
-
-/*
-         *A frequency
-         *For numbers lower than 10^9, we encode the number in 'm' and
-         *set 'e' to 0
-         *For number greater than 10^9, we divide it by the lowest power
-         *of 10 to get 'm' lower than 10^9, with 'm'= f / (10^'e')...
-         *The power of 10 is in 'e', the result of the division is in 'm'.
- */
-        structiw_freq
-{
-                __s32           m;      /* Mantissa */
-                __s16           e;      /* Exponent */
-                __u8            i;      /* List index (when in range struct) */
-                __u8            pad;    /* Unused - just for alignement */
-};
-
-/*
-         *Quality of the link
- */
-        structiw_quality
-{
-                __u8            qual;   /* link quality (%retries, SNR,
-                                           %missed beacons or better...) */
-                __u8            level;  /* signal level (dBm) */
-                __u8            noise;  /* noise level (dBm) */
-                __u8            updated;/* Flags to know if updated */
-};
-
-/*
-         *Packet discarded in the wireless adapter due to
-         *"wireless" specific problems...
-         *Note : the list of counter and statistics in net_device_stats
-         *is already pretty exhaustive, and you should use that first.
-         *This is only additional stats...
- */
-        structiw_discarded
-{
-                __u32           nwid;   /* Rx : Wrong nwid/essid */
-                __u32           code;   /* Rx : Unable to code/decode (WEP) */
-                __u32           fragment;/* Rx : Can't perform MAC reassembly */
-                __u32           retries;/* Tx : Max MAC retries num reached */
-                __u32           misc;   /* Others cases */
-};
-
-/*
-         *Packet/Time period missed in the wireless adapter due to
-         *"wireless" specific problems...
- */
-        structiw_missed
-{
-                __u32           beacon;         /* Missed beacons/superframe */
-};
-
-/*
-         *Quality range (for spy threshold)
- */
-        structiw_thrspy
-{
-                struct sockaddr                 addr;   /* Source address (hw/mac) */
-                struct iw_quality       qual;   /* Quality of the link */
-                struct iw_quality       low;    /* Low threshold */
-                struct iw_quality       high;   /* High threshold */
-};
-
-/* ------------------------ WIRELESS STATS ------------------------ */
-/*
- * Wireless statistics (used for /proc/net/wireless)
- */
-        structiw_statistics
-{
-                __u16           status;         /* Status
-                                         * - device dependent for now */
-
-                struct iw_quality       qual;   /* Quality of the link
-                                                 * (instant/mean/max) */
-                struct iw_discarded     discard;/* Packet discarded counts */
-                struct iw_missed        miss;   /* Packet missed counts */
-};
-
-/* ------------------------ IOCTL REQUEST ------------------------ */
-/*
- * This structure defines the payload of an ioctl, and is used 
- * below.
- *
- * Note that this structure should fit on the memory footprint
- * of iwreq (which is the same as ifreq), which mean a max size of
- * 16 octets = 128 bits. Warning, pointers might be 64 bits wide...
- * You should check this when increasing the structures defined
- * above in this file...
- */
-        unioniwreq_data
-{
-        /* Config - generic */
-                char    name[IFNAMSIZ];
-        /* Name : used to verify the presence of  wireless extensions.
-         * Name of the protocol/provider... */
-
-                struct iw_point         essid;  /* Extended network name */
-                struct iw_param         nwid;   /* network id (or domain - the cell) */
-                struct iw_freq  freq;   /* frequency or channel :
-                                         * 0-1000 = channel
-                                         * > 1000 = frequency in Hz */
-
-                struct iw_param         sens;   /* signal level threshold */
-                struct iw_param         bitrate;/* default bit rate */
-                struct iw_param         txpower;/* default transmit power */
-                struct iw_param         rts;    /* RTS threshold threshold */
-                struct iw_param         frag;   /* Fragmentation threshold */
-                __u32           mode;   /* Operation mode */
-                struct iw_param         retry;  /* Retry limits & lifetime */
-
-                struct iw_point         encoding;/* Encoding stuff : tokens */
-                struct iw_param         power;  /* PM duration/timeout */
-                struct iw_quality qual;         /* Quality part of statistics */
-
-                struct sockaddr         ap_addr;/* Access point address */
-                struct sockaddr         addr;   /* Destination address (hw/mac) */
-
-                struct iw_param         param;  /* Other small parameters */
-                struct iw_point         data;   /* Other large parameters */
-};
-
-/*
- * The structure to exchange data for ioctl.
- * This structure is the same as 'struct ifreq', but (re)defined for
- * convenience...
- * Do I need to remind you about structure size (32 octets) ?
- */
-        structiwreq 
-{
-        union
-        {
-                        char    ifrn_name[IFNAMSIZ];/* if name, e.g. "eth0" */
-        } ifr_ifrn;
-
-        /* Data part (defined just above) */
-                union   iwreq_datau;
-};
-
-/* -------------------------- IOCTL DATA -------------------------- */
-/*
-         *For those ioctl which want to exchange mode data that what could
-         *fit in the above structure...
- */
-
-/*
-         *Range of parameters
- */
-
-        structiw_range
-{
-        /* Informative stuff (to choose between different interface) */
-                __u32           throughput;/* To give an idea... */
-        /* In theory this value should be the maximum benchmarked
-         * TCP/IP throughput, because with most of these devices the
-         * bit rate is meaningless (overhead an co) to estimate how
-         * fast the connection will go and pick the fastest one.
-         * I suggest people to play with Netperf or any benchmark...
-         */
-
-        /* NWID (or domain id) */
-                __u32           min_nwid;/* Minimal NWID we are able to set */
-                __u32           max_nwid;/* Maximal NWID we are able to set */
-
-        /* Old Frequency (backward compat - moved lower ) */
-                __u16   old_num_channels;
-                __u8    old_num_frequency;
-        /* Filler to keep "version" at the same offset */
-                __s32   old_freq[6];
-
-        /* signal level threshold range */
-                __s32sensitivity;
-
-        /* Quality of link & SNR stuff */
-        /* Quality range (link, level, noise)
-         * If the quality is absolute, it will be in the range [0 ; max_qual],
-         * if the quality is dBm, it will be in the range [max_qual ; 0].
-         * Don't forget that we use 8 bit arithmetics... */
-                struct iw_quality       max_qual;/* Quality of the link */
-        /* This should contain the average/typical values of the quality
-         * indicator. This should be the threshold between a "good" and
-         * a "bad" link (example : monitor going from green to orange).
-         * Currently, user space apps like quality monitors don't have any
-         * way to calibrate the measurement. With this, they can split
-         * the range between 0 and max_qual in different quality level
-         * (using a geometric subdivision centered on the average).
-         * I expect that people doing the user space apps will feedback
-         * us on which value we need to put in each driver... */
-                struct iw_quality       avg_qual;/* Quality of the link */
-
-        /* Rates */
-                __u8            num_bitrates;/* Number of entries in the list */
-                __s32           bitrate[IW_MAX_BITRATES];/* list, in bps */
-
-        /* RTS threshold */
-                __s32           min_rts;/* Minimal RTS threshold */
-                __s32           max_rts;/* Maximal RTS threshold */
-
-        /* Frag threshold */
-                __s32           min_frag;/* Minimal frag threshold */
-                __s32           max_frag;/* Maximal frag threshold */
-
-        /* Power Management duration & timeout */
-                __s32           min_pmp;/* Minimal PM period */
-                __s32           max_pmp;/* Maximal PM period */
-                __s32           min_pmt;/* Minimal PM timeout */
-                __s32           max_pmt;/* Maximal PM timeout */
-                __u16           pmp_flags;/* How to decode max/min PM period */
-                __u16           pmt_flags;/* How to decode max/min PM timeout */
-                __u16           pm_capa;/* What PM options are supported */
-
-        /* Encoder stuff */
-                __u16   encoding_size[IW_MAX_ENCODING_SIZES];/* Different token sizes */
-                __u8    num_encoding_sizes;/* Number of entry in the list */
-                __u8    max_encoding_tokens;/* Max number of tokens */
-        /* For drivers that need a "login/passwd" form */
-                __u8    encoding_login_index;/* token index for login token */
-
-        /* Transmit power */
-                __u16           txpower_capa;/* What options are supported */
-                __u8            num_txpower;/* Number of entries in the list */
-                __s32           txpower[IW_MAX_TXPOWER];/* list, in bps */
-
-        /* Wireless Extension version info */
-                __u8            we_version_compiled;/* Must be WIRELESS_EXT */
-                __u8            we_version_source;/* Last update of source */
-
-        /* Retry limits and lifetime */
-                __u16           retry_capa;/* What retry options are supported */
-                __u16           retry_flags;/* How to decode max/min retry limit */
-                __u16           r_time_flags;/* How to decode max/min retry life */
-                __s32           min_retry;/* Minimal number of retries */
-                __s32           max_retry;/* Maximal number of retries */
-                __s32           min_r_time;/* Minimal retry lifetime */
-                __s32           max_r_time;/* Maximal retry lifetime */
-
-        /* Frequency */
-                __u16           num_channels;/* Number of channels [0; num - 1] */
-                __u8            num_frequency;/* Number of entry in the list */
-                struct iw_freq  freq[IW_MAX_FREQUENCIES];/* list */
-        /* Note : this frequency list doesn't need to fit channel numbers,
-         * because each entry contain its channel index */
-};
-
-/*
- * Private ioctl interface information
- */
- 
-        structiw_priv_args
-{
-                __u32           cmd;    /* Number of the ioctl to issue */
-                __u16           set_args;/* Type and number of args */
-                __u16           get_args;/* Type and number of args */
-                char            name[IFNAMSIZ];/* Name of the extension */
-};
-
-/* ----------------------- WIRELESS EVENTS ----------------------- */
-/*
- * Wireless events are carried through the rtnetlink socket to user
- * space. They are encapsulated in the IFLA_WIRELESS field of
- * a RTM_NEWLINK message.
- */
-
-/*
- * A Wireless Event. Contains basically the same data as the ioctl...
- */
-struct iw_event
-{
-                __u16           len;            /* Real lenght of this stuff */
-                __u16           cmd;            /* Wireless IOCTL */
-                union iwreq_data        u;      /* IOCTL fixed payload */
-};
-
-/* Size of the Event prefix (including padding and alignement junk) */
-        #define IW_EV_LCP_LEN(sizeof(struct iw_event) - sizeof(union iwreq_data))
-/* Size of the various events */
-        #define IW_EV_CHAR_LEN(IW_EV_LCP_LEN + IFNAMSIZ)
-        #define IW_EV_UINT_LEN(IW_EV_LCP_LEN + sizeof(__u32))
-        #define IW_EV_FREQ_LEN(IW_EV_LCP_LEN + sizeof(struct iw_freq))
-        #define IW_EV_POINT_LEN(IW_EV_LCP_LEN + sizeof(struct iw_point))
-        #define IW_EV_PARAM_LEN(IW_EV_LCP_LEN + sizeof(struct iw_param))
-        #define IW_EV_ADDR_LEN(IW_EV_LCP_LEN + sizeof(struct sockaddr))
-        #define IW_EV_QUAL_LEN(IW_EV_LCP_LEN + sizeof(struct iw_quality))
-
-/* Note : in the case of iw_point, the extra data will come at the
- * end of the event */
-
-        #endif/* _LINUX_WIRELESS_H */