Use Mde library and definition instead of some native definitions in NetLib, to simpl...

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Tcp4Dxe / Tcp4Option.c

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c
index b81f442a6fc3fc36080f6835e8a121396c9e0d39..4e6570754189b60cc87a31b6c5988d03ca7988c2 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c
@@ -29,7 +29,7 @@ TcpGetUint16 (
   )\r
 {\r
   UINT16  Value;\r
-  NetCopyMem (&Value, Buf, sizeof (UINT16));\r
+  CopyMem (&Value, Buf, sizeof (UINT16));\r
   return NTOHS (Value);\r
 }\r
 \r
@@ -41,7 +41,7 @@ TcpPutUint16 (
   )\r
 {\r
   Data = HTONS (Data);\r
-  NetCopyMem (Buf, &Data, sizeof (UINT16));\r
+  CopyMem (Buf, &Data, sizeof (UINT16));\r
 }\r
 \r
 STATIC\r
@@ -51,7 +51,7 @@ TcpGetUint32 (
   )\r
 {\r
   UINT32  Value;\r
-  NetCopyMem (&Value, Buf, sizeof (UINT32));\r
+  CopyMem (&Value, Buf, sizeof (UINT32));\r
   return NTOHL (Value);\r
 }\r
 \r
@@ -63,7 +63,7 @@ TcpPutUint32 (
   )\r
 {\r
   Data = HTONL (Data);\r
-  NetCopyMem (Buf, &Data, sizeof (UINT32));\r
+  CopyMem (Buf, &Data, sizeof (UINT32));\r
 }\r
 \r
 \r
@@ -250,7 +250,7 @@ TcpParseOption (
 \r
   Option->Flag  = 0;\r
 \r
-  TotalLen      = (Tcp->HeadLen << 2) - sizeof (TCP_HEAD);\r
+  TotalLen      = (UINT8) ((Tcp->HeadLen << 2) - sizeof (TCP_HEAD));\r
   if (TotalLen <= 0) {\r
     return 0;\r
   }\r
@@ -303,7 +303,7 @@ TcpParseOption (
         return -1;\r
       }\r
 \r
-      Option->WndScale = (UINT8) NET_MIN (14, Head[Cur + 2]);\r
+      Option->WndScale = (UINT8) MIN (14, Head[Cur + 2]);\r
       TCP_SET_FLG (Option->Flag, TCP_OPTION_RCVD_WS);\r
 \r
       Cur += TCP_OPTION_WS_LEN;\r