--- a/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/src/wlandevicesettings.cpp	Fri Apr 16 16:56:12 2010 +0300
+++ b/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/src/wlandevicesettings.cpp	Mon May 03 14:14:02 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 20 %
+* %version: 21 %
 */
 
 // INCLUDE FILES
@@ -206,6 +206,7 @@
     aSettings.automaticTrafficStreamMgmt = ETrue;
     aSettings.minActiveBroadcastChannelTime = KWlanDefaultMinActiveBroadcastChannelTime;
     aSettings.maxActiveBroadcastChannelTime = KWlanDefaultMaxActiveBroadcastChannelTime;
+    aSettings.enabledFeatures = KWlanDefaultEnabledFeatures;
     aSettings.region = KWlanDefaultRegion;
     aSettings.regionTimestamp = KWlanDefaultRegionTimestamp;
     }
@@ -804,6 +805,13 @@
         aSettings.maxActiveBroadcastChannelTime = temp;
         }  
 
+    // Read KWlanEnabledFeatures
+    err = repository->Get( KWlanEnabledFeatures, temp );
+    if( err == KErrNone ) 
+        {
+        aSettings.enabledFeatures = temp;
+        }  
+
     // Read KWlanRegion
     err = repository->Get( KWlanRegion, temp );
     if( err == KErrNone ) 
@@ -1440,6 +1448,15 @@
         DEBUG1( "CWlanDeviceSettings::WritePrivateData() - could not set key 0x%X", KWlanMaxActiveBroadcastChannelTime );
         }
 
+    // Write KWlanEnabledFeatures
+    err = repository->Set( 
+        KWlanEnabledFeatures, 
+        static_cast<TInt>( aSettings.enabledFeatures ) );
+    if( err ) 
+        {
+        DEBUG1( "CWlanDeviceSettings::WritePrivateData() - could not set key 0x%X", KWlanEnabledFeatures );
+        }
+
     // Write KWlanRegion
     err = repository->Set( 
     	KWlanRegion, 
@@ -1717,6 +1734,8 @@
         aSettings.minActiveBroadcastChannelTime );
     DEBUG1( "CWlanDeviceSettings::LogSettings() - maxActiveBroadcastChannelTime == %d",
         aSettings.maxActiveBroadcastChannelTime );
+    DEBUG1( "CWlanDeviceSettings::LogSettings() - enabledFeatures == %d",
+        aSettings.enabledFeatures );    
     DEBUG1( "CWlanDeviceSettings::LogSettings() - region == %u",
         aSettings.region );
     DEBUG1( "CWlanDeviceSettings::LogSettings() - regionTimestamp == %d",