networkcontrol/iptransportlayer/src/netmcpr.cpp
branchRCL_3
changeset 75 c1029e558ef5
parent 53 7e41d162e158
--- a/networkcontrol/iptransportlayer/src/netmcpr.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkcontrol/iptransportlayer/src/netmcpr.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -33,8 +33,6 @@
 
 #ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 #include <tcpdfltrecvwin.h>
-// Custom type for WLAN bearer
-const TUint32 KNetMcprWlanBearer = 0x3C;
 #endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 #include <commsdattypeinfov1_1_internal.h>
 
@@ -479,11 +477,8 @@
    	//TCP receive window size for ethernet
    	iBearerInfoMap.Insert(KEthernetBearer,KBearerEthernetWinSize);
 
-    //TCP receive window size for WLAN bearer
-    iBearerInfoMap.Insert(KNetMcprWlanBearer,KBearerWlanWinSize);
-   	
    	//TCP receive window size for other bearer
-   	iBearerInfoMap.Insert(KDefaultBearer,KBearerDefaultWinSize);
+   	iBearerInfoMap.Insert(KDefaultBearer,KBearerWlanWinSize);
 	}
 
 void CDfltTCPReceiveWindowSize::SetTcpWin(TUint aBearerType)
@@ -491,20 +486,8 @@
  * Set TCP receive window 
  */
 	{
-    // Get bearer window size from hash table
-    TUint* iWinSizePtr = static_cast<TUint*>(iBearerInfoMap.Find(aBearerType));
-
-    // Check whether bearer type was known 
-    if ( iWinSizePtr != NULL )
-        {
-        // Set the TCP Receive Window
-        iWinSize = *iWinSizePtr;
-        }
-    else
-        {
-        // Use default window
-        iWinSize = KBearerDefaultWinSize;
-        }
+	//Set the TCP Receive Window.
+	iWinSize = *static_cast<TUint*>(iBearerInfoMap.Find(aBearerType));
 	  
 	//Set the Max TCP receive Window.
 	SetMaxWinSize(aBearerType);
@@ -528,16 +511,12 @@
 		//
 			iMaxWinSize = KBearerHsdpaWinSize; 
 			break; 
-		case KNetMcprWlanBearer:
-			iMaxWinSize = KBearerWlanWinSize;
+		case KEthernetBearer:
+			iMaxWinSize = KEthernetMaxWinSize;
 			break;
    
-        case KEthernetBearer:
-            iMaxWinSize = KEthernetMaxWinSize;
-            break;
-			
 		default:
-			iMaxWinSize = KBearerDefaultMaxWinSize;
+			iMaxWinSize = KEthernetMaxWinSize;
 			break;
 		}
 	}