# HG changeset patch
# User srilekhas <srilekhas@symbian.org>
# Date 1284740159 -3600
# Node ID 61fa4f7b5dd19a8bcb44c4d467da26b400253fe4
# Parent  425d8f4f7fa57ad6ae521ada31593ffa7226ebf5# Parent  e36178c55292c2a75d8660c51e2ab4540316cb68
Merge RCL_3 fixes for Bug 1894 and Bug 3108 with the latest delivery.

diff -r 425d8f4f7fa5 -r 61fa4f7b5dd1 linklayercontrol/networkinterfacemgr/group/BLD.INF
--- a/linklayercontrol/networkinterfacemgr/group/BLD.INF	Wed Sep 15 00:18:51 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/group/BLD.INF	Fri Sep 17 17:15:59 2010 +0100
@@ -94,6 +94,9 @@
 ../inc/cfbearers.h 							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(networking/cfbearers.h)
 #endif // SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 
+// Bug 3108, required to build sf_refhw image
+NetCfgExtnBase.iby              /epoc32/rom/include/NetCfgExtnBase.iby
+
 PRJ_MMPFILES
 
 NIFMAN.MMP        
diff -r 425d8f4f7fa5 -r 61fa4f7b5dd1 networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp
--- a/networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp	Wed Sep 15 00:18:51 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp	Fri Sep 17 17:15:59 2010 +0100
@@ -34,7 +34,9 @@
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY     	euser.lib efsrv.lib 
-LIBRARY		cinidata.lib
+// darios: cinidata is deprecated, see bug #1894
+//LIBRARY		cinidata.lib
+LIBRARY		IniParser.lib
 
 epocheapsize  1000 6000000
 CAPABILITY All -Tcb
diff -r 425d8f4f7fa5 -r 61fa4f7b5dd1 networkingtestandutils/networkingintegrationtest/inc/TestStep.h
--- a/networkingtestandutils/networkingintegrationtest/inc/TestStep.h	Wed Sep 15 00:18:51 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/inc/TestStep.h	Fri Sep 17 17:15:59 2010 +0100
@@ -26,7 +26,9 @@
 #if (!defined __TESTSTEP_H__)
 #define __TESTSTEP_H__
 
-#include "cinidata.h"
+// darios: cinidata is deprecated, see bug #1894
+//#include "cinidata.h"
+#include <iniparser.h>
 #include "networking/log.h"
 
 class CTestSuite;