- Merge r45531 and r45545 from aicom-network-branch

svn path=/trunk/; revision=45546
This commit is contained in:
Cameron Gutman 2010-02-10 00:55:58 +00:00
parent 3a6220a5f0
commit f11ee9cfaf

View file

@ -107,11 +107,11 @@ int TCPPacketSend(void *ClientData, OSK_PCHAR data, OSK_UINT len ) {
/* Memory management routines /* Memory management routines
* *
* By far the most requests for memory are either for 128 or 2048 byte blocks, * By far the most requests for memory are either for 128 or 2049 byte blocks,
* so we want to satisfy those from lookaside lists. Unfortunately, the * so we want to satisfy those from lookaside lists. Unfortunately, the
* TCPFree() function doesn't pass the size of the block to be freed, so we * TCPFree() function doesn't pass the size of the block to be freed, so we
* need to keep track of it ourselves. We do it by prepending each block with * need to keep track of it ourselves. We do it by prepending each block with
* 4 bytes, indicating if this is a 'L'arge (2048), 'S'mall (128) or 'O'ther * 4 bytes, indicating if this is a 'L'arge (2049), 'S'mall (128) or 'O'ther
* block. * block.
*/ */
@ -119,7 +119,7 @@ int TCPPacketSend(void *ClientData, OSK_PCHAR data, OSK_UINT len ) {
#define MEM_PROFILE 0 #define MEM_PROFILE 0
#define SMALL_SIZE 128 #define SMALL_SIZE 128
#define LARGE_SIZE 2048 #define LARGE_SIZE 2049
#define SIGNATURE_LARGE 'LLLL' #define SIGNATURE_LARGE 'LLLL'
#define SIGNATURE_SMALL 'SSSS' #define SIGNATURE_SMALL 'SSSS'