From b460a3a14498fb2e1fcee5872e1c7a2ed6d70278 Mon Sep 17 00:00:00 2001
From: liuh-80 <liuh@microsoft.com>
Date: Fri, 27 Sep 2024 09:33:05 +0000
Subject: [PATCH] Improve code

---
 cfgmgr/portmgr.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/cfgmgr/portmgr.cpp b/cfgmgr/portmgr.cpp
index 32ade0c4da..15d2f7e052 100644
--- a/cfgmgr/portmgr.cpp
+++ b/cfgmgr/portmgr.cpp
@@ -183,10 +183,18 @@ void PortMgr::doTask(Consumer &consumer)
                 if (fvField(i) == "mtu")
                 {
                     mtu = fvValue(i);
+                    if (!portOk)
+                    {
+                        field_values.emplace_back(i);
+                    }
                 }
                 else if (fvField(i) == "admin_status")
                 {
                     admin_status = fvValue(i);
+                    if (!portOk)
+                    {
+                        field_values.emplace_back(i);
+                    }
                 }
                 else
                 {
@@ -203,8 +211,6 @@ void PortMgr::doTask(Consumer &consumer)
             {
                 SWSS_LOG_WARN("Port %s is not ready, pending...", alias.c_str());
 
-                writeConfigToAppDb(alias, "mtu", mtu);
-                writeConfigToAppDb(alias, "admin_status", admin_status);
                 /* Retry setting these params after the netdev is created */
                 field_values.clear();
                 field_values.emplace_back("mtu", mtu);