summaryrefslogtreecommitdiffstats
path: root/NetworkPkg/Dhcp6Dxe
diff options
context:
space:
mode:
authorLiming Gao <liming.gao@intel.com>2018-06-27 21:12:32 +0800
committerLiming Gao <liming.gao@intel.com>2018-06-28 11:19:49 +0800
commitf75a7f568e6d0944327970b3f3f2dafd9bba76b1 (patch)
treecc64f0e24e92dab5713bf2099f7e1f4fc5152ff6 /NetworkPkg/Dhcp6Dxe
parent9095d37b8fe5bfc3d02adad6ba7fd7359ebc0107 (diff)
downloadedk2-f75a7f568e6d0944327970b3f3f2dafd9bba76b1.tar.gz
edk2-f75a7f568e6d0944327970b3f3f2dafd9bba76b1.tar.bz2
edk2-f75a7f568e6d0944327970b3f3f2dafd9bba76b1.zip
NetworkPkg: Clean up source files
1. Do not use tab characters 2. No trailing white space in one line 3. All files must end with CRLF Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'NetworkPkg/Dhcp6Dxe')
-rw-r--r--NetworkPkg/Dhcp6Dxe/ComponentName.c24
-rw-r--r--NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c10
-rw-r--r--NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf8
-rw-r--r--NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.uni4
-rw-r--r--NetworkPkg/Dhcp6Dxe/Dhcp6DxeExtra.uni6
-rw-r--r--NetworkPkg/Dhcp6Dxe/Dhcp6Impl.c8
-rw-r--r--NetworkPkg/Dhcp6Dxe/Dhcp6Impl.h4
-rw-r--r--NetworkPkg/Dhcp6Dxe/Dhcp6Io.c24
-rw-r--r--NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c26
9 files changed, 57 insertions, 57 deletions
diff --git a/NetworkPkg/Dhcp6Dxe/ComponentName.c b/NetworkPkg/Dhcp6Dxe/ComponentName.c
index ba612156a0..9b834167f5 100644
--- a/NetworkPkg/Dhcp6Dxe/ComponentName.c
+++ b/NetworkPkg/Dhcp6Dxe/ComponentName.c
@@ -1,7 +1,7 @@
/** @file
UEFI Component Name(2) protocol implementation for Dhcp6 driver.
- Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2018, 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
@@ -247,10 +247,10 @@ Dhcp6ComponentNameGetDriverName (
@param Dhcp6[in] A pointer to the EFI_DHCP6_PROTOCOL.
-
+
@retval EFI_SUCCESS Update the ControllerNameTable of this instance successfully.
@retval EFI_INVALID_PARAMETER The input parameter is invalid.
-
+
**/
EFI_STATUS
UpdateName (
@@ -272,12 +272,12 @@ UpdateName (
if (EFI_ERROR (Status)) {
return Status;
}
-
+
if (gDhcp6ControllerNameTable != NULL) {
FreeUnicodeStringTable (gDhcp6ControllerNameTable);
gDhcp6ControllerNameTable = NULL;
}
-
+
if (Dhcp6ModeData.Ia == NULL) {
HandleName = L"DHCPv6 (No configured IA)";
} else {
@@ -304,7 +304,7 @@ UpdateName (
if (EFI_ERROR (Status)) {
return Status;
}
-
+
return AddUnicodeString2 (
"en",
gDhcp6ComponentName2.SupportedLanguages,
@@ -401,13 +401,13 @@ Dhcp6ComponentNameGetControllerName (
if (ChildHandle == NULL) {
return EFI_UNSUPPORTED;
}
-
- //
- // Make sure this driver produced ChildHandle
- //
+
+ //
+ // Make sure this driver produced ChildHandle
+ //
Status = EfiTestChildHandle (
ControllerHandle,
- ChildHandle,
+ ChildHandle,
&gEfiUdp6ProtocolGuid
);
if (EFI_ERROR (Status)) {
@@ -420,7 +420,7 @@ Dhcp6ComponentNameGetControllerName (
Status = gBS->OpenProtocol (
ChildHandle,
&gEfiDhcp6ProtocolGuid,
- (VOID **)&Dhcp6,
+ (VOID **)&Dhcp6,
NULL,
NULL,
EFI_OPEN_PROTOCOL_GET_PROTOCOL
diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c b/NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c
index de53a1a9b4..eaa18fcff3 100644
--- a/NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c
+++ b/NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c
@@ -2,7 +2,7 @@
Driver Binding functions and Service Binding functions
implementationfor for Dhcp6 Driver.
- Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2018, 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
@@ -328,7 +328,7 @@ Dhcp6CreateInstance (
/**
Callback function which provided by user to remove one node in NetDestroyLinkList process.
-
+
@param[in] Entry The entry to be removed.
@param[in] Context Pointer to the callback context corresponds to the Context in NetDestroyLinkList.
@@ -352,7 +352,7 @@ Dhcp6DestroyChildEntry (
Instance = NET_LIST_USER_STRUCT_S (Entry, DHCP6_INSTANCE, Link, DHCP6_INSTANCE_SIGNATURE);
ServiceBinding = (EFI_SERVICE_BINDING_PROTOCOL *) Context;
-
+
return ServiceBinding->DestroyChild (ServiceBinding, Instance->Handle);
}
@@ -558,7 +558,7 @@ Dhcp6DriverBindingStop (
if (!IsListEmpty (&Service->Child)) {
//
// Destroy all the children instances before destory the service.
- //
+ //
List = &Service->Child;
Status = NetDestroyLinkList (
List,
@@ -591,7 +591,7 @@ Dhcp6DriverBindingStop (
Dhcp6DestroyService (Service);
Status = EFI_SUCCESS;
}
-
+
ON_EXIT:
return Status;
}
diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf b/NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
index 40a6ee7889..03c2ca1ddf 100644
--- a/NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
+++ b/NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
@@ -1,11 +1,11 @@
## @file
# Client-side DHCPv6 services.
-#
+#
# This driver produces EFI DHCPv6 Protocol which is used to get IPv6 addresses
# and other configuration parameters from DHCPv6 servers.
#
# (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
-# Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2018, 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
@@ -74,9 +74,9 @@
gEfiDhcp6ProtocolGuid ## BY_START
gEfiIp6ConfigProtocolGuid ## TO_START
-[Guids]
+[Guids]
gZeroGuid ## SOMETIMES_CONSUMES ## GUID
-
+
[Pcd]
gEfiNetworkPkgTokenSpaceGuid.PcdDhcp6UidType ## SOMETIMES_CONSUMES
diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.uni b/NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.uni
index 34ecd6c6ef..ff542838f0 100644
--- a/NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.uni
+++ b/NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.uni
@@ -4,13 +4,13 @@
// This driver produces EFI DHCPv6 Protocol which is used to get IPv6 addresses
// and other configuration parameters from DHCPv6 servers.
//
-// Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2009 - 2018, 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
// which accompanies this distribution. The full text of the license may be found at
// http://opensource.org/licenses/bsd-license.php.
-//
+//
// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6DxeExtra.uni b/NetworkPkg/Dhcp6Dxe/Dhcp6DxeExtra.uni
index ca9fa0c22e..8eb8064600 100644
--- a/NetworkPkg/Dhcp6Dxe/Dhcp6DxeExtra.uni
+++ b/NetworkPkg/Dhcp6Dxe/Dhcp6DxeExtra.uni
@@ -1,7 +1,7 @@
// /** @file
// Dhcp6Dxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, 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
@@ -13,8 +13,8 @@
//
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"DHCP6 DXE"
diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6Impl.c b/NetworkPkg/Dhcp6Dxe/Dhcp6Impl.c
index b479421f83..9ace833b98 100644
--- a/NetworkPkg/Dhcp6Dxe/Dhcp6Impl.c
+++ b/NetworkPkg/Dhcp6Dxe/Dhcp6Impl.c
@@ -1,7 +1,7 @@
/** @file
This EFI_DHCP6_PROTOCOL interface implementation.
- Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2018, 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
@@ -237,7 +237,7 @@ EfiDhcp6Stop (
}
Status = Instance->UdpSts;
}
-
+
ON_EXIT:
//
// Clean up the session data for the released Ia.
@@ -678,7 +678,7 @@ EfiDhcp6InfoRequest (
return Status;
}
- do {
+ do {
TimerStatus = gBS->CheckEvent (Timer);
if (!EFI_ERROR (TimerStatus)) {
Status = Dhcp6StartInfoRequest (
@@ -694,7 +694,7 @@ EfiDhcp6InfoRequest (
);
}
} while (TimerStatus == EFI_NOT_READY);
-
+
gBS->CloseEvent (Timer);
}
if (EFI_ERROR (Status)) {
diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6Impl.h b/NetworkPkg/Dhcp6Dxe/Dhcp6Impl.h
index 7110bf88de..f21b79668a 100644
--- a/NetworkPkg/Dhcp6Dxe/Dhcp6Impl.h
+++ b/NetworkPkg/Dhcp6Dxe/Dhcp6Impl.h
@@ -1,7 +1,7 @@
/** @file
Dhcp6 internal data structure and definition declaration.
- Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2018, 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
@@ -132,7 +132,7 @@ struct _DHCP6_INSTANCE {
BOOLEAN MediaPresent;
//
// StartTime is used to calculate the 'elapsed-time' option. Refer to RFC3315,
- // the elapsed-time is amount of time since the client began its current DHCP transaction.
+ // the elapsed-time is amount of time since the client began its current DHCP transaction.
//
UINT64 StartTime;
};
diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c b/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c
index 5cdeac6d5c..5ad2ac38bf 100644
--- a/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c
+++ b/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c
@@ -2,7 +2,7 @@
Dhcp6 internal functions implementation.
(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
- Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2018, 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
@@ -372,7 +372,7 @@ Dhcp6CleanupRetry (
@retval TRUE The control block is in Instance's retry list.
@retval FALSE The control block is NOT in Instance's retry list.
-
+
**/
BOOLEAN
Dhcp6IsValidTxCb (
@@ -1767,12 +1767,12 @@ Dhcp6StartInfoRequest (
if (EFI_ERROR (Status) && (Status != EFI_ALREADY_STARTED)) {
goto ON_ERROR;
}
-
+
gBS->RestoreTPL (OldTpl);
return EFI_SUCCESS;
-
+
ON_ERROR:
- gBS->RestoreTPL (OldTpl);
+ gBS->RestoreTPL (OldTpl);
RemoveEntryList (&InfCb->Link);
FreePool (InfCb);
@@ -1896,7 +1896,7 @@ Dhcp6SendInfoRequestMsg (
//
Packet->Length += (UINT32) (Cursor - Packet->Dhcp6.Option);
ASSERT (Packet->Size > Packet->Length + 8);
-
+
//
// Clear initial time for current transaction.
//
@@ -2232,15 +2232,15 @@ Dhcp6HandleReplyMsg (
}
} else if (Status == EFI_NOT_FOUND) {
//
- // Refer to RFC3315 Chapter 18.1.8, for each IA in the original Renew or Rebind message,
+ // Refer to RFC3315 Chapter 18.1.8, for each IA in the original Renew or Rebind message,
// the client sends a Renew or Rebind if the IA is not in the Reply message.
// Return EFI_SUCCESS so we can continue to restart the Renew/Rebind process.
//
return EFI_SUCCESS;
}
-
+
goto ON_EXIT;
-
+
} else if (Option != NULL) {
//
// Any error status code option is found.
@@ -2289,7 +2289,7 @@ Dhcp6HandleReplyMsg (
case Dhcp6StsNoBinding:
if (Instance->IaCb.Ia->State == Dhcp6Renewing || Instance->IaCb.Ia->State == Dhcp6Rebinding) {
//
- // Refer to RFC3315 Chapter 18.1.8, for each IA in the original Renew or Rebind message, the client
+ // Refer to RFC3315 Chapter 18.1.8, for each IA in the original Renew or Rebind message, the client
// sends a Request message if the IA contained a Status Code option with the NoBinding status.
//
Status = Dhcp6SendRequestMsg(Instance);
@@ -2308,7 +2308,7 @@ Dhcp6HandleReplyMsg (
}
return EFI_SUCCESS;
-
+
ON_EXIT:
if (!EFI_ERROR(Status)) {
@@ -2318,7 +2318,7 @@ ON_EXIT:
FALSE
);
}
-
+
return Status;
}
diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c b/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c
index a65ed6d589..10a99a00d4 100644
--- a/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c
+++ b/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c
@@ -2,7 +2,7 @@
Dhcp6 support functions implementation.
(C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
- Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2018, 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
@@ -68,7 +68,7 @@ Dhcp6GenerateClientId (
//
//
// The format of DUID-UUID:
- //
+ //
// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// | DUID-Type (4) | UUID (128 bits) |
@@ -91,16 +91,16 @@ Dhcp6GenerateClientId (
// sizeof (Duid-type + UUID-size) = 18 bytes
//
Duid->Length = (UINT16) (18);
-
+
//
// Set the Duid-type and copy UUID.
//
WriteUnaligned16 ((UINT16 *) (Duid->Duid), HTONS (Dhcp6DuidTypeUuid));
-
+
CopyMem (Duid->Duid + 2, &Uuid, sizeof(EFI_GUID));
} else {
-
+
//
//
// The format of DUID-LLT:
@@ -135,12 +135,12 @@ Dhcp6GenerateClientId (
if (Duid == NULL) {
return NULL;
}
-
+
//
// sizeof (Duid-type + hardware-type + time) = 8 bytes
//
Duid->Length = (UINT16) (Mode->HwAddressSize + 8);
-
+
//
// Set the Duid-type, hardware-type, time and copy the hardware address.
//
@@ -687,7 +687,7 @@ Dhcp6AppendIaAddrOption (
// . IAaddr-options .
// . .
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
+
//
// Fill the value of Ia Address option type
//
@@ -1000,7 +1000,7 @@ Dhcp6SeekIaOption (
}
/**
- Check whether the incoming IPv6 address in IaAddr is one of the maintained
+ Check whether the incoming IPv6 address in IaAddr is one of the maintained
addresses in the IA control blcok.
@param[in] IaAddr The pointer to the IA Address to be checked.
@@ -1019,7 +1019,7 @@ Dhcp6AddrIsInCurrentIa (
UINT32 Index;
ASSERT (IaAddr != NULL && CurrentIa != NULL);
-
+
for (Index = 0; Index < CurrentIa->IaAddressCount; Index++) {
if (EFI_IP6_EQUAL(&IaAddr->IpAddress, &CurrentIa->IaAddress[Index].IpAddress)) {
return TRUE;
@@ -1303,7 +1303,7 @@ EFI_STATUS
Dhcp6GetMappingTimeOut (
IN EFI_IP6_CONFIG_PROTOCOL *Ip6Cfg,
OUT UINTN *TimeOut
- )
+ )
{
EFI_STATUS Status;
UINTN DataSize;
@@ -1323,8 +1323,8 @@ Dhcp6GetMappingTimeOut (
if (EFI_ERROR (Status)) {
return Status;
}
-
+
*TimeOut = TICKS_PER_SECOND * DadXmits.DupAddrDetectTransmits + DHCP6_DAD_ADDITIONAL_DELAY;
-
+
return EFI_SUCCESS;
}