diff options
| author | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-04-04 03:31:13 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-04-04 03:31:13 +0000 |
| commit | f51c8a85e7dee7cd16fcedca48d48aeb956e296b (patch) | |
| tree | ee0a24e9c71768fbc2febde091918179d5bcc761 /NetworkPkg/Dhcp6Dxe | |
| parent | b500e065680c0c62c0d24ca0a8fe0000c097be0c (diff) | |
| download | edk2-f51c8a85e7dee7cd16fcedca48d48aeb956e296b.tar.gz | |
Sync patches r14116, r14167, r14168, r14169 and r14170 from main trunk.
1. Fix corrupt PXE boot menu display issue.
2. Fix a bug in IP4 driver that the broadcast/multicast mac address is overrided by the gateway's mac address.
3. Initialize DefaultInfo before using it.
4. Update DHCP6 driver to handle EFI_DHCP6_CALLBACK return status correctly.
5. Fix a bug in IP4 driver which may cause "reconnect -r" hang.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/UDK2010.SR1@14244 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'NetworkPkg/Dhcp6Dxe')
| -rw-r--r-- | NetworkPkg/Dhcp6Dxe/Dhcp6Io.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c b/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c index 0e83d07853..7f791676bc 100644 --- a/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c +++ b/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c @@ -1,7 +1,7 @@ /** @file
Dhcp6 internal functions implementation.
- Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2013, 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
@@ -2925,7 +2925,9 @@ Dhcp6OnTimerTick ( // Select the advertisement received before.
//
Status = Dhcp6SelectAdvertiseMsg (Instance, Instance->AdSelect);
- if (EFI_ERROR (Status)) {
+ if (Status == EFI_ABORTED) {
+ goto ON_CLOSE;
+ } else if (EFI_ERROR (Status)) {
TxCb->RetryCnt++;
}
return;
@@ -2941,6 +2943,7 @@ Dhcp6OnTimerTick ( // Check whether overflow the max retry count limit for this packet
//
if (TxCb->RetryCtl.Mrc != 0 && TxCb->RetryCtl.Mrc < TxCb->RetryCnt) {
+ Status = EFI_NO_RESPONSE;
goto ON_CLOSE;
}
@@ -2948,6 +2951,7 @@ Dhcp6OnTimerTick ( // Check whether overflow the max retry duration for this packet
//
if (TxCb->RetryCtl.Mrd != 0 && TxCb->RetryCtl.Mrd <= TxCb->RetryLos) {
+ Status = EFI_NO_RESPONSE;
goto ON_CLOSE;
}
@@ -3037,9 +3041,10 @@ Dhcp6OnTimerTick ( ON_CLOSE:
- if (TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgInfoRequest ||
+ if (TxCb->TxPacket != NULL &&
+ (TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgInfoRequest ||
TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgRenew ||
- TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgConfirm
+ TxCb->TxPacket->Dhcp6.Header.MessageType == Dhcp6MsgConfirm)
) {
//
// The failure of renew/Confirm will still switch to the bound state.
@@ -3064,6 +3069,6 @@ Dhcp6OnTimerTick ( //
// The failure of the others will terminate current state machine if timeout.
//
- Dhcp6CleanupSession (Instance, EFI_NO_RESPONSE);
+ Dhcp6CleanupSession (Instance, Status);
}
}
|