1 files changed, 3 insertions, 2 deletions

diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index be2736a..95e7043 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -606,97 +606,98 @@ double OWirelessNetworkInterface::frequency() const
         return -1.0;
     }
     else
     {
         return double( _iwr.u.freq.m ) * pow( 10.0, _iwr.u.freq.e ) / 1000000000.0;
     }
 }
 
 
 int OWirelessNetworkInterface::channels() const
 {
     return _channels.count();
 }
 
 
 void OWirelessNetworkInterface::setChannelHopping( int interval )
 {
     if ( !_hopper ) _hopper = new OChannelHopper( this );
     _hopper->setInterval( interval );
     //FIXME: When and by whom will the channel hopper be deleted?
     //TODO: rely on QObject hierarchy
 }
 
 
 int OWirelessNetworkInterface::channelHopping() const
 {
     return _hopper->interval();
 }
 
 
 OChannelHopper* OWirelessNetworkInterface::channelHopper() const
 {
     return _hopper;
 }
 
 
 void OWirelessNetworkInterface::setMonitorMode( bool b )
 {
     if ( _mon )
         _mon->setEnabled( b );
     else
         qDebug( "ONetwork(): can't switch monitor mode without installed monitoring interface" );
 }
 
 
 bool OWirelessNetworkInterface::monitorMode() const
 {
     qDebug( "dataLinkType = %d", dataLinkType() );
-    return dataLinkType() == ARPHRD_IEEE80211;
+    return ( dataLinkType() == ARPHRD_IEEE80211 || dataLinkType() == 802 );
+    // 802 is the header type for PRISM - Linux support for this is pending...
 }
 
 
 QString OWirelessNetworkInterface::nickName() const
 {
     char str[IW_ESSID_MAX_SIZE];
     _iwr.u.data.pointer = &str[0];
     _iwr.u.data.length = IW_ESSID_MAX_SIZE;
     if ( !wioctl( SIOCGIWNICKN ) )
     {
         return "<unknown>";
     }
     else
     {
         str[_iwr.u.data.length] = 0x0; // some drivers (e.g. wlan-ng) don't zero-terminate the string
         return str;
     }
 }
 
 
 void OWirelessNetworkInterface::setPrivate( const QString& call, int numargs, ... )
 {
     OPrivateIOCTL* priv = static_cast<OPrivateIOCTL*>( child( (const char*) call ) );
     if ( !priv )
     {
         qDebug( "OWirelessNetworkInterface::setPrivate(): interface '%s' does not support private ioctl '%s'", name(), (const char*) call );
         return;
     }
     if ( priv->numberSetArgs() != numargs )
     {
         qDebug( "OWirelessNetworkInterface::setPrivate(): parameter count not matching. '%s' expects %d arguments, but got %d", (const char*) call, priv->numberSetArgs(), numargs );
         return;
     }
 
     qDebug( "OWirelessNetworkInterface::setPrivate(): about to call '%s' on interface '%s'", (const char*) call, name() );
     memset( &_iwr, 0, sizeof _iwr );
     va_list argp;
     va_start( argp, numargs );
     for ( int i = 0; i < numargs; ++i )
     {
         priv->setParameter( i, va_arg( argp, int ) );
     }
     va_end( argp );
     priv->invoke();
 }
 
 
 void OWirelessNetworkInterface::getPrivate( const QString& call )
@@ -888,69 +889,69 @@ OHostAPMonitoringInterface::OHostAPMonitoringInterface( ONetworkInterface* iface
 
 OHostAPMonitoringInterface::~OHostAPMonitoringInterface()
 {
 }
 
 void OHostAPMonitoringInterface::setEnabled( bool b )
 {
     // IW_MODE_MONITOR was introduced in Wireless Extensions Version 15
     // Wireless Extensions < Version 15 need iwpriv commandos for monitoring
 
     //TODO: check wireless extensions version on runtime and use
     //TODO: SIOCSIWMODE( IW_MODE_MONITOR ) if running on WE >= 15
 
     if ( b )
     {
         _if->setPrivate( "monitor", 1, 2 );
     }
     else
     {
         _if->setPrivate( "monitor", 1, 0 );
     }
 }
 
 
 QString OHostAPMonitoringInterface::name() const
 {
     return "hostap";
 }
 
 
 /*======================================================================================
  * OOrinocoNetworkInterface
  *======================================================================================*/
 
 OOrinocoMonitoringInterface::OOrinocoMonitoringInterface( ONetworkInterface* iface )
                            :OMonitoringInterface( iface )
 {
     iface->setMonitoring( this );
 }
 
 
 OOrinocoMonitoringInterface::~OOrinocoMonitoringInterface()
 {
 }
 
 
 void OOrinocoMonitoringInterface::setChannel( int c )
 {
-    _if->setPrivate( "monitor", 2, 2, c );
+    _if->setPrivate( "monitor", 2, 1, c );
 }
 
 
 void OOrinocoMonitoringInterface::setEnabled( bool b )
 {
     if ( b )
     {
         setChannel( 1 );
     }
     else
     {
         _if->setPrivate( "monitor", 2, 0, 0 );
     }
 }
 
 
 QString OOrinocoMonitoringInterface::name() const
 {
     return "orinoco";
 }