commit 05d84e4758941f95ab93608fe0158e8a28713381
author Chandra Harkude <Chandramohan.harkude@gmail.com> Wed Sep 03 16:39:40 2025 +0000
committer Ed Tanous <ed@tanous.net> Thu Sep 04 01:13:26 2025 +0000
tree fb3cba8ebc6accf9b3f6eb2edab03bafd7e775f3
parent 71526116e1eb38a983df0ca12de63348d37e0e9b

Revert "ethernet: Fix premature gateway clearing on static IP validation fail"

This reverts commit 8d26c0d3a9bf14f5ad36b89db3fd3ce0d428655c.

Reason for revert: This is causing the Gateway to clear while assigning the static IP

Change-Id: Ie7878e3ed25c2907fdf6e7bcb7a2a26aea78a367
Signed-off-by: Chandramohan Harkude <chandramohan.harkude@gmail.com>

redfish-core/lib/ethernet.hpp

diff --git a/redfish-core/lib/ethernet.hpp b/redfish-core/lib/ethernet.hpp
index 31693e1..53e21c5 100644
--- a/redfish-core/lib/ethernet.hpp
+++ b/redfish-core/lib/ethernet.hpp
@@ -2416,12 +2416,6 @@
                             return;
                         }
 
-                        if (ipv4StaticAddresses)
-                        {
-                            handleIPv4StaticPatch(ifaceId, *ipv4StaticAddresses,
-                                                  ethData, ipv4Data, asyncResp);
-                        }
-
                         handleDHCPPatch(ifaceId, ethData, v4dhcpParms,
                                         v6dhcpParms, asyncResp);
 
@@ -2447,6 +2441,12 @@
                                                   asyncResp);
                         }
 
+                        if (ipv4StaticAddresses)
+                        {
+                            handleIPv4StaticPatch(ifaceId, *ipv4StaticAddresses,
+                                                  ethData, ipv4Data, asyncResp);
+                        }
+
                         if (staticNameServers)
                         {
                             handleStaticNameServersPatch(