From 216f79703b8cb8dc65abdd768bedb2bcdbc1a1f8 Mon Sep 17 00:00:00 2001
From: sfu5 <sfu5@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 13 Dec 2012 06:47:06 +0000
Subject: 1. Add EFI_COMPONENT_NAME2_PROTOCOL.GetControllerName() support. 2.
 Fix the driver binding Stop() hang issue in the network stack. 3. Add Ip4 raw
 data support. 4. Add iSCSI Dhcp option 60 support.

Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Ouyang Qian <qian.ouyang@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13995 6f19259b-4bc3-4df7-8a09-765794883524
---
 NetworkPkg/IpSecDxe/ComponentName.c | 45 +++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

(limited to 'NetworkPkg/IpSecDxe')

diff --git a/NetworkPkg/IpSecDxe/ComponentName.c b/NetworkPkg/IpSecDxe/ComponentName.c
index e164d8bbb3..d68b175cc1 100644
--- a/NetworkPkg/IpSecDxe/ComponentName.c
+++ b/NetworkPkg/IpSecDxe/ComponentName.c
@@ -1,7 +1,7 @@
 /** @file
   UEFI Component Name(2) protocol implementation for IPsec driver.
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -172,6 +172,17 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mIpSecDriverNameTable[] =
   }
 };
 
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mIpSecControllerNameTable[] = {
+  {
+    "eng;en",
+    L"IPsec Controller"
+  },
+  {
+    NULL,
+    NULL
+  }
+};
+
 /**
   Retrieves a Unicode string that is the user-readable name of the driver.
 
@@ -306,5 +317,35 @@ IpSecComponentNameGetControllerName (
   OUT CHAR16                       **ControllerName
   )
 {
-  return EFI_UNSUPPORTED;
+  EFI_STATUS Status;
+
+  //
+  // ChildHandle must be NULL for a Device Driver
+  //
+  if (ChildHandle != NULL) {
+    return EFI_UNSUPPORTED;
+  }
+  
+  //
+  // Make sure this driver is currently managing ControllerHandle
+  //
+  Status = gBS->OpenProtocol (
+                  ControllerHandle,
+                  &gEfiIpSec2ProtocolGuid,
+                  NULL,
+                  NULL,
+                  NULL,
+                  EFI_OPEN_PROTOCOL_TEST_PROTOCOL
+                  );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  return LookupUnicodeString2 (
+           Language,
+           This->SupportedLanguages,
+           mIpSecControllerNameTable,
+           ControllerName,
+           (BOOLEAN) (This == &gIpSecComponentName)
+           );
 }
-- 
cgit v1.2.3