OvmfPkg/VirtioFsDxe: add EFI_FILE_INFO cache fields to VIRTIO_FS_FILE

[mirror_edk2.git] / NetworkPkg / TcpDxe / TcpDriver.c

diff --git a/NetworkPkg/TcpDxe/TcpDriver.c b/NetworkPkg/TcpDxe/TcpDriver.c
index 2d4b16cd9e27bc315bae18f9dc5c3e5968126462..c4dcb5e193ae9b49adf2d148bb4301063eececd7 100644 (file)
--- a/NetworkPkg/TcpDxe/TcpDriver.c
+++ b/NetworkPkg/TcpDxe/TcpDriver.c
@@ -3,13 +3,7 @@
 \r
   Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
 \r
-  This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php.\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -202,16 +196,11 @@ TcpDriverEntryPoint (
              &gTcpComponentName2\r
              );\r
   if (EFI_ERROR (Status)) {\r
-    gBS->UninstallMultipleProtocolInterfaces (\r
-           ImageHandle,\r
-           &gEfiDriverBindingProtocolGuid,\r
-           &gTcp4DriverBinding,\r
-           &gEfiComponentName2ProtocolGuid,\r
-           &gTcpComponentName2,\r
-           &gEfiComponentNameProtocolGuid,\r
-           &gTcpComponentName,\r
-           NULL\r
-           );\r
+    EfiLibUninstallDriverBindingComponentName2 (\r
+      &gTcp4DriverBinding,\r
+      &gTcpComponentName,\r
+      &gTcpComponentName2\r
+      );\r
     return Status;\r
   }\r
 \r
@@ -743,13 +732,13 @@ Tcp6DriverBindingStop (
 }\r
 \r
 /**\r
-  The Callback funtion called after the TCP socket was created.\r
+  The Callback function called after the TCP socket was created.\r
 \r
   @param[in]  This            Pointer to the socket just created\r
   @param[in]  Context         Context of the socket\r
 \r
   @retval EFI_SUCCESS         This protocol installed successfully.\r
-  @retval other               An error occured.\r
+  @retval other               An error occurred.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -867,7 +856,7 @@ TcpDestroySocketCallback (
                                 If it is a pointer to an existing UEFI handle,\r
                                 then the protocol is added to the existing UEFI handle.\r
 \r
-  @retval EFI_SUCCES            The protocol was added to ChildHandle.\r
+  @retval EFI_SUCCESS           The protocol was added to ChildHandle.\r
   @retval EFI_INVALID_PARAMETER ChildHandle is NULL.\r
   @retval EFI_OUT_OF_RESOURCES  There are not enough resources available to create\r
                                 the child.\r
@@ -899,7 +888,7 @@ TcpServiceBindingCreateChild (
   TcpProto.TcpPcb     = NULL;\r
 \r
   //\r
-  // Create a tcp instance with defualt Tcp default\r
+  // Create a tcp instance with default Tcp default\r
   // sock init data and TcpProto\r
   //\r
   mTcpDefaultSockData.ProtoData     = &TcpProto;\r
@@ -941,7 +930,7 @@ TcpServiceBindingCreateChild (
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param  ChildHandle Handle of the child to be destroyed.\r
 \r
-  @retval EFI_SUCCES            The protocol was removed from ChildHandle.\r
+  @retval EFI_SUCCESS           The protocol was removed from ChildHandle.\r
   @retval EFI_UNSUPPORTED       ChildHandle does not support the protocol that is being removed.\r
   @retval EFI_INVALID_PARAMETER Child handle is NULL.\r
   @retval EFI_ACCESS_DENIED     The protocol could not be removed from the ChildHandle\r