From: Jiaxin Wu <jiaxin.wu@intel.com>
Date: Wed, 16 Sep 2015 09:02:48 +0000 (+0000)
Subject: NetworkPkg: Fix connection issue after correct SPD and re-enable IPsec
X-Git-Tag: edk2-stable201903~8854
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=2f667c5488c81924861901d4d7c6f4bb170ffb69

NetworkPkg: Fix connection issue after correct SPD and re-enable IPsec

This patch is used to fix connection failure issue after correct the SPD
and re-enable IPsec. The driver should not update the SadEntry's SpdSelector
when doing SpdEntry modification. SadEntry's SpdSelector may not equal to
this edited SpdEntry’s Selector.

Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18484 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/NetworkPkg/IpSecDxe/IpSecConfigImpl.c b/NetworkPkg/IpSecDxe/IpSecConfigImpl.c
index 6aa47aabab..8c7724c7da 100644
--- a/NetworkPkg/IpSecDxe/IpSecConfigImpl.c
+++ b/NetworkPkg/IpSecDxe/IpSecConfigImpl.c
@@ -1204,12 +1204,7 @@ SetSpdEntry (
           RemoveEntryList (&SadEntry->BySpd);
         }
         InsertTailList (&SpdEntry->Data->Sas, &SadEntry->BySpd);
-        SadEntry->Data->SpdEntry = SpdEntry;
-        DuplicateSpdSelector (
-          (EFI_IPSEC_CONFIG_SELECTOR *)SadEntry->Data->SpdSelector,
-          (EFI_IPSEC_CONFIG_SELECTOR *)SpdEntry->Selector,
-          NULL
-          );             
+        SadEntry->Data->SpdEntry = SpdEntry;             
       }
     }
   }