--- a/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/inc/wlmserver.h	Mon Jun 21 10:46:23 2010 +0300
+++ b/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/inc/wlmserver.h	Fri Jul 02 13:43:20 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 57 %
+* %version: 59 %
 */
 
 #ifndef WLMSERVER_H
@@ -79,6 +79,10 @@
     public MWlanEapolCallbackInterface,
     public MWlanScanResultProvider
     {
+    
+    // Friend class for Unit Testing
+    friend class UT_CWlmServer;
+    
     public:  // Constructors and destructor
 
         /** 
@@ -94,6 +98,7 @@
             TAny* iParam1;
             TAny* iParam2;
             TAny* iParam3;
+            TAny* iParam4;
             TUint* iTime;
 
             SRequestMapEntry() :
@@ -104,6 +109,7 @@
                 iParam1( NULL ),
                 iParam2( NULL ),
                 iParam3( NULL ),
+                iParam4( NULL ),
                 iTime( NULL )
                 { }
             };
@@ -983,11 +989,11 @@
         	TUint& aTriggeringRequestIndex );        
 
         /**
-        * Notify the server that a background scan has been done.
-        */
+         * Notify the server that a background scan has been done.
+         */
         void NotifyBackgroundScanDone( 
             ScanList* aScanList, 
-            core_type_list_c<u32_t>* aIapIdList );
+            core_type_list_c<core_iap_availability_data_s>& aIapAvailabilityData );
 
         /**
          * Check if this request can be completed.
@@ -1411,7 +1417,22 @@
          * Flag indicating whether aggressive scanning has to be performed
          * after link loss.
          */   
-        TBool iAggressiveScanningAfterLinkLoss;        
+        TBool iAggressiveScanningAfterLinkLoss;
+
+        /**
+         * WLAN device settings. 
+         */
+        CWlanDeviceSettings::SWlanDeviceSettings iDeviceSettings;
+
+        /**
+         * List of "weak" IAP IDs. 
+         */
+        RArray<TUint> iIapWeakList;
+        
+        /**
+         * IAP ID of the connection.
+         */
+        TUint iConnectionIapId;
     };