-rw-r--r-- | libopie2/opienet/onetwork.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp index 36f409b..915814d 100644 --- a/libopie2/opienet/onetwork.cpp +++ b/libopie2/opienet/onetwork.cpp | |||
@@ -1194,23 +1194,26 @@ OOrinocoMonitoringInterface::~OOrinocoMonitoringInterface() | |||
1194 | { | 1194 | { |
1195 | } | 1195 | } |
1196 | 1196 | ||
1197 | 1197 | ||
1198 | void OOrinocoMonitoringInterface::setChannel( int c ) | 1198 | void OOrinocoMonitoringInterface::setChannel( int c ) |
1199 | { | 1199 | { |
1200 | int monitorCode = _prismHeader ? 1 : 2; | 1200 | if ( !_if->hasPrivate( "monitor" ) ) |
1201 | _if->setPrivate( "monitor", 2, monitorCode, c ); | 1201 | { |
1202 | this->OMonitoringInterface::setChannel( c ); | ||
1203 | } | ||
1204 | else | ||
1205 | { | ||
1206 | int monitorCode = _prismHeader ? 1 : 2; | ||
1207 | _if->setPrivate( "monitor", 2, monitorCode, c ); | ||
1208 | } | ||
1202 | } | 1209 | } |
1203 | 1210 | ||
1204 | 1211 | ||
1205 | void OOrinocoMonitoringInterface::setEnabled( bool b ) | 1212 | void OOrinocoMonitoringInterface::setEnabled( bool b ) |
1206 | { | 1213 | { |
1207 | // IW_MODE_MONITOR was introduced in Wireless Extensions Version 15 | ||
1208 | // Wireless Extensions < Version 15 need iwpriv commandos for monitoring | ||
1209 | // However, as of recent orinoco drivers, IW_MODE_MONITOR is still not supported | ||
1210 | |||
1211 | if ( b ) | 1214 | if ( b ) |
1212 | { | 1215 | { |
1213 | setChannel( 1 ); | 1216 | setChannel( 1 ); |
1214 | } | 1217 | } |
1215 | else | 1218 | else |
1216 | { | 1219 | { |