- remove deprecated setMonitorMode() API. Use setMode( "monitor" ) now.

- monitor mode now tries to use the standard IW_MODE_MONITOR first. If that
  doesn't work, it falls back to using proprietary iwpriv commands

1 files changed, 7 insertions, 9 deletions

diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index 0eb4542..eb6c86e 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -351,5 +351,4 @@ class OWirelessNetworkInterface : public ONetworkInterface
      * Possible values are <ul><li>adhoc<li>managed<li>monitor<li>master or <li>unknown
-     */
-    virtual QString mode() const;
-    /**
+     *
+     * @note: Important note concerning the 'monitor' mode:
      * Setting the monitor mode on a wireless network interface enables
@@ -364,7 +363,3 @@ class OWirelessNetworkInterface : public ONetworkInterface
      */
-    virtual void setMonitorMode( bool ); //FIXME: ==> setMode( "monitor" ); Use IW_MONITOR first, if this doesn't work, then use iwpriv!
-    /**
-     * @returns true if the device is listening in IEEE 802.11 monitor mode
-     */
-    virtual bool monitorMode() const;  //FIXME: ==> mode()
+    virtual QString mode() const;
     /**
@@ -424,2 +419,6 @@ class OWirelessNetworkInterface : public ONetworkInterface
     virtual OStationList* scanNetwork();
+    /** @internal commit pending changes to the driver
+     *
+     */
+    void commit() const;
 
@@ -458,3 +457,2 @@ class OMonitoringInterface
     virtual void setEnabled( bool );
-    virtual bool enabled() const;
     virtual void setChannel( int );