Merge branch 'linaro-release' of git://git.linaro.org/arm/uefi/uefi-next.gitlinaro-uefi-2013.05

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

5 files changed, 53 insertions, 39 deletions

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
index b1f250b55..aff036bb7 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
@@ -1,7 +1,7 @@
 /** @file

   The implementation of iSCSI protocol based on RFC3720.

 

-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 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

 which accompanies this distribution.  The full text of the license may be found at

@@ -742,7 +742,7 @@ IScsiProcessLoginRsp (
   NetbufQueAppend (&Conn->RspQue, Pdu);

 

   Conn->PartialRspRcvd = Continue;

-  if (Continue) {

+  if ((!Transit) || Continue) {

     //

     // It's a partial response, have to wait for another or more Request/Response

     // conversations to get the full response.

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
index 4a3d34271..73b4e246e 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
@@ -1,7 +1,7 @@
 /** @file

   The driver binding and service binding protocol for IP4 driver.

 

-Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 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

 which accompanies this distribution.  The full text of the license may be found at

@@ -572,6 +572,8 @@ Ip4DriverBindingStop (
   INTN                                     State;

   LIST_ENTRY                               *List;

   IP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT  Context;

+  IP4_INTERFACE                            *IpIf;

+  IP4_ROUTE_TABLE                          *RouteTable;

 

   //

   // IP4 driver opens the MNP child, ARP children or the IP4_CONFIG protocol

@@ -681,6 +683,35 @@ Ip4DriverBindingStop (
                &Context,

                NULL

                );

+  } else if (IpSb->DefaultInterface->ArpHandle == ControllerHandle) {

+    //

+    // The ARP protocol for the default interface is being uninstalled and all

+    // its IP child handles should have been destroyed before. So, release the

+    // default interface and route table, create a new one and mark it as not started.

+    //

+    Ip4CancelReceive (IpSb->DefaultInterface);

+    Ip4FreeInterface (IpSb->DefaultInterface, NULL);

+    Ip4FreeRouteTable (IpSb->DefaultRouteTable);

+    

+    IpIf = Ip4CreateInterface (IpSb->Mnp, IpSb->Controller, IpSb->Image);

+    if (IpIf == NULL) {

+      goto ON_ERROR;

+    }

+    RouteTable = Ip4CreateRouteTable ();

+    if (RouteTable == NULL) {

+      Ip4FreeInterface (IpIf, NULL);

+      goto ON_ERROR;;

+    }

+    

+    IpSb->DefaultInterface  = IpIf;

+    InsertHeadList (&IpSb->Interfaces, &IpIf->Link);

+    IpSb->DefaultRouteTable = RouteTable;

+    Ip4ReceiveFrame (IpIf, NULL, Ip4AccpetFrame, IpSb);

+

+    if (IpSb->Ip4Config != NULL && IpSb->State != IP4_SERVICE_DESTROY) {

+      IpSb->Ip4Config->Stop (IpSb->Ip4Config);

+    }

+    IpSb->State = IP4_SERVICE_UNSTARTED;

   } else if (IsListEmpty (&IpSb->Children)) {

     State           = IpSb->State;

     IpSb->State     = IP4_SERVICE_DESTROY;

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
index 671163633..e4ab17a37 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
@@ -740,11 +740,24 @@ Ip4FreeInterface (
   //

   Ip4CancelFrames (Interface, EFI_ABORTED, Ip4CancelInstanceFrame, IpInstance);

 

+  if (--Interface->RefCnt > 0) {

+    return EFI_SUCCESS;

+  }

+

   //

-  // Destroy the ARP instance if this is the last IP instance that

-  // has the address.

+  // Destroy the interface if this is the last IP instance that

+  // has the address. Remove all the system transmitted packets

+  // from this interface, cancel the receive request if there is

+  // one, and destroy the ARP requests.

   //

-  if (Interface->Arp != NULL && IsListEmpty (&Interface->IpInstances)) {

+  Ip4CancelFrames (Interface, EFI_ABORTED, Ip4CancelInstanceFrame, NULL);

+  Ip4CancelReceive (Interface);

+

+  ASSERT (IsListEmpty (&Interface->IpInstances));

+  ASSERT (IsListEmpty (&Interface->ArpQues));

+  ASSERT (IsListEmpty (&Interface->SentFrames));

+

+  if (Interface->Arp != NULL) {

     gBS->CloseProtocol (

           Interface->ArpHandle,

           &gEfiArpProtocolGuid,

@@ -758,25 +771,8 @@ Ip4FreeInterface (
       &gEfiArpServiceBindingProtocolGuid,

       Interface->ArpHandle

       );

-    Interface->Arp = NULL;

-  }

-  

-  if (--Interface->RefCnt > 0) {

-    return EFI_SUCCESS;

   }

 

-  //

-  // Destroy the interface if it is not referenced by any IP instance (for common Interface)

-  // or the IP service (for the DefaultInterface). Remove all the system transmitted packets

-  // from this interface, cancel the receive request if there is one.

-  //

-  Ip4CancelFrames (Interface, EFI_ABORTED, Ip4CancelInstanceFrame, NULL);

-  Ip4CancelReceive (Interface);

-

-  ASSERT (IsListEmpty (&Interface->IpInstances));

-  ASSERT (IsListEmpty (&Interface->ArpQues));

-  ASSERT (IsListEmpty (&Interface->SentFrames));

-

   RemoveEntryList (&Interface->Link);

   FreePool (Interface);

 

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
index 76eac722c..29a0cf76c 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
@@ -1,7 +1,7 @@
 /** @file

   Tcp driver function.

 

-Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 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

 which accompanies this distribution.  The full text of the license may be found at

@@ -607,7 +607,7 @@ Tcp4CreateSocketCallback (
                   (VOID **) &This->ParentDevicePath,

                   TcpServiceData->DriverBindingHandle,

                   This->SockHandle,

-                  EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER

+                  EFI_OPEN_PROTOCOL_GET_PROTOCOL

                   );

   if (EFI_ERROR (Status)) {

     gBS->CloseProtocol (

@@ -649,16 +649,6 @@ Tcp4DestroySocketCallback (
   RemoveEntryList (&This->Link);

 

   //

-  // Close the device path protocol

-  //

-  gBS->CloseProtocol (

-         TcpServiceData->ControllerHandle,

-         &gEfiDevicePathProtocolGuid,

-         TcpServiceData->DriverBindingHandle,

-         This->SockHandle

-         );

-

-  //

   // Close the Ip4 protocol.

   //

   gBS->CloseProtocol (

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
index 3ac4fb041..423555aec 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
@@ -1,7 +1,7 @@
 ## @file

 # Component name for module UefiPxeBc

 #

-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2007 - 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

@@ -66,9 +66,6 @@
   DpcLib

   PcdLib

 

-[Guids]

-  gEfiSmbiosTableGuid                              # ALWAYS_CONSUMED

-

 [Protocols]

   gEfiArpServiceBindingProtocolGuid                # PROTOCOL ALWAYS_CONSUMED

   gEfiArpProtocolGuid                              # PROTOCOL ALWAYS_CONSUMED