public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: Fu Siyuan <siyuan.fu@intel.com>
To: edk2-devel@lists.01.org
Cc: Ye Ting <ting.ye@intel.com>, Wu Jiaxin <jiaxin.wu@intel.com>,
	Wang Fan <fan.wang@intel.com>
Subject: [Patch 1/5] NetworkPkg: Abort the PXE process if DHCP has been started by other instance.
Date: Tue,  2 Jan 2018 13:27:40 +0800	[thread overview]
Message-ID: <20180102052744.9928-2-siyuan.fu@intel.com> (raw)
In-Reply-To: <20180102052744.9928-1-siyuan.fu@intel.com>

PXE need to use extended DHCP options and check received offers in callback
function, so there is no need to continue the PXE process if DHCP driver has
been started by other instance but not PXE driver itself.

Cc: Ye Ting <ting.ye@intel.com>
Cc: Wu Jiaxin <jiaxin.wu@intel.com>
Cc: Wang Fan <fan.wang@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
---
 NetworkPkg/UefiPxeBcDxe/PxeBcDhcp4.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp4.c b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp4.c
index 101c65824a..9c33835759 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp4.c
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp4.c
@@ -1,7 +1,7 @@
 /** @file
   Functions implementation related with DHCPv4 for UefiPxeBc Driver.
 
-  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
@@ -1697,13 +1697,8 @@ PxeBcDhcp4Dora (
   ZeroMem (Private->OfferCount, sizeof (Private->OfferCount));
   ZeroMem (Private->OfferIndex, sizeof (Private->OfferIndex));
 
-  //
-  // Start DHCPv4 D.O.R.A. process to acquire IPv4 address. This may 
-  // have already been done, thus do not leave in error if the return
-  // code is EFI_ALREADY_STARTED.
-  //
   Status = Dhcp4->Start (Dhcp4, NULL);
-  if (EFI_ERROR (Status) && Status != EFI_ALREADY_STARTED) {
+  if (EFI_ERROR (Status)) {
     if (Status == EFI_ICMP_ERROR) {
       PxeMode->IcmpErrorReceived = TRUE;
     }
-- 
2.13.0.windows.1



  reply	other threads:[~2018-01-02  5:22 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-02  5:27 [Patch 0/5] Refine PXE driver code logic Fu Siyuan
2018-01-02  5:27 ` Fu Siyuan [this message]
2018-01-02  5:27 ` [Patch 2/5] NetworkPkg: Check allocated buffer pointer before use Fu Siyuan
2018-01-02  6:26   ` Gary Lin
2018-01-02  5:27 ` [Patch 3/5] NetworkPkg: Fix memory leak problem in PXE driver Fu Siyuan
2018-01-02  5:27 ` [Patch 4/5] NetworkPkg: Add assert for buffer pointer from DHCP driver Fu Siyuan
2018-01-02  5:27 ` [Patch 5/5] NetworkPkg: Update PXE driver to check for NULL pointer before use it Fu Siyuan
2018-01-02  5:43   ` Subramanian, Sriram
2018-01-02  5:45 ` [Patch 0/5] Refine PXE driver code logic Subramanian, Sriram
2018-01-02  5:50 ` Subramanian, Sriram
2018-01-04  1:02   ` Fu, Siyuan
2018-01-02  6:59 ` Wu, Jiaxin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180102052744.9928-2-siyuan.fu@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox