diff -r 00c6709d25aa -r 9d7ce34704c8 datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionudp_ethernet_MOMAP16xx.xml
--- a/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionudp_ethernet_MOMAP16xx.xml	Thu Aug 19 11:05:47 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionudp_ethernet_MOMAP16xx.xml	Tue Aug 31 16:25:36 2010 +0300
@@ -6,7 +6,6 @@
  under the terms of "Eclipse Public License v1.0"
  which accompanies this distribution, and is available
  at the URL "http://www.eclipse.org/legal/epl-v10.html".
-
  Initial Contributors:
  Nokia Corporation - initial contribution.
 
@@ -30,10 +29,10 @@
 
 <NetworkTable>
     <Network operation="add">
-        <Name>NT RAS</Name>
+        <Name>Intranet</Name>
     </Network>
     <Network operation="add">
-        <Name>Intranet</Name>
+        <Name>NT RAS</Name>
     </Network>
     <Network operation="add">
         <Name>Linux</Name>
@@ -66,8 +65,8 @@
         <IAPNetworkWeighting>0</IAPNetworkWeighting>
         <LocationRef>Location.Mobile</LocationRef>
     </IAP>
-    <IAP operation="add">
-        <Name>Additional Default Dial In ISP</Name>
+	<IAP operation="add">
+        <Name>Additional Dial In ISP</Name>
         <IAPService>DialInISP.Dial In CS ISP</IAPService>
         <IAPBearer>ModemBearer.Linux</IAPBearer>
         <IAPNetwork>Network.NT RAS</IAPNetwork>
@@ -99,12 +98,12 @@
         <LocationRef>Location.Office Direct Dial</LocationRef>
     </IAP>
     <IAP operation="add">
-        <Name>Ethernet with Daemon Dynamic IP</Name>
-        <IAPService>LANService.Ethernet</IAPService>
-        <IAPBearer>LANBearer.EKA2 Ethernet</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
+		<Name>WlanConnectivity</Name>
+		<IAPService>LANService.WlanConnectivity</IAPService>
+       <IAPBearer>LANBearer.WLANBearer</IAPBearer>
+		<IAPNetwork>Network.Intranet</IAPNetwork>
+		<IAPNetworkWeighting>0</IAPNetworkWeighting>
+		<LocationRef>Location.Office Direct Dial</LocationRef>
     </IAP>
     <IAP operation="add">
         <Name>Virtual Comm port</Name>
@@ -155,7 +154,7 @@
         <LocationRef>Location.Office</LocationRef>
     </IAP>
 </IAPTable>
-
+	
 <ModemBearerTable>
     <ModemBearer operation="template">
         <Name>Default Modem</Name>
@@ -703,33 +702,34 @@
 
 <LANBearerTable>
     <LANBearer operation="add">
-	<Name>EKA2 Ethernet</Name>
-	<Agent>nullagt.agt</Agent>
-	<IfName>ethint</IfName>
-	<LDDFilename>enet</LDDFilename>
-	<LDDName>Ethernet</LDDName>
-	<PDDFilename>ethernet</PDDFilename>
-	<PDDName>Ethernet.MOMAP16xx</PDDName>
-	<PacketDriverName>EtherPkt.drv</PacketDriverName>
-	<LastSocketActivityTimeout>10</LastSocketActivityTimeout>
-	<LastSessionClosedTimeout>10</LastSessionClosedTimeout>
-	<LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+		<Name>WLANBearer</Name>
+		<IfName>wlannif</IfName>
+		<LDDName>not used</LDDName>
+		<PDDName>not used</PDDName>
+		<LastSocketActivityTimeout>10</LastSocketActivityTimeout>
+		<LastSessionClosedTimeout>10</LastSessionClosedTimeout>
+		<LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+		<Agent>wlanagt.agt</Agent>
     </LANBearer>
 </LANBearerTable>
 
 <LANServiceTable>
     <LANService operation="add">
-        <Name>Ethernet</Name>
-        <IfNetworks>ip</IfNetworks>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IpGateway>10.23.143.254</IpGateway>
-        <IpAddr></IpAddr>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <IpNameServer1>10.16.59.15</IpNameServer1>
-        <IpNameServer2>10.112.58.6</IpNameServer2>
-        <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
-        <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
+		<Name>WlanConnectivity</Name>
+		<IfNetworks>ip</IfNetworks>
+		<IpNetMask>255.255.255.0</IpNetMask>
+		<IpGateway>0.0.0.0</IpGateway>
+		<IpAddrFromServer>TRUE</IpAddrFromServer>
+		<IpAddr>0.0.0.0</IpAddr>
+		<IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+		<IpNameServer1>0.0.0.0</IpNameServer1>
+		<IpNameServer2>0.0.0.0</IpNameServer2>
+		<Ip6DnsAddrFromServer>TRUE</Ip6DnsAddrFromServer>
+		<Ip6NameServer1>0:0:0:0:0:0:0:0</Ip6NameServer1>
+		<Ip6NameServer2>0:0:0:0:0:0:0:0</Ip6NameServer2>
+		<IpAddrLeaseValidFrom>0</IpAddrLeaseValidFrom>
+		<ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
+		<ConfigDaemonName>!DhcpServ</ConfigDaemonName>
     </LANService>
 </LANServiceTable>
 
@@ -1049,8 +1049,8 @@
         <Ranking>1</Ranking>
         <Direction>OUTGOING</Direction>
         <DialogPref>DONOTPROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.Dummy</IAPRef>
+        <BearerSet>LAN</BearerSet>
+        <IAPRef>IAP.WlanConnectivity</IAPRef>
     </ConnectionPreferences>
 </ConnectionPreferencesTable>