From 29d81dd9d06ef730873e721ed940157a0cce4fc6 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <junchao@nvidia.com>
Date: Mon, 24 Apr 2023 11:07:19 +0800
Subject: [PATCH] Revert "Ignore removing switch for mellanox platform due to
 known limitation (#1216)"

This reverts commit 10f37ef48f21f350cb44e2734f9e807bb916121e.
---
 configure.ac    |  4 ----
 syncd/Syncd.cpp | 11 +----------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index cd177ce80..5e0171964 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,10 +17,6 @@ AX_ADD_AM_MACRO_STATIC([])
 
 AM_CONDITIONAL(SONIC_ASIC_PLATFORM_BAREFOOT,   test x$CONFIGURED_PLATFORM = xbarefoot)
 AM_CONDITIONAL(SONIC_ASIC_PLATFORM_BROADCOM,   test x$CONFIGURED_PLATFORM = xbroadcom)
-AM_CONDITIONAL(SONIC_ASIC_PLATFORM_MELLANOX,   test x$CONFIGURED_PLATFORM = xmellanox)
-
-AM_COND_IF([SONIC_ASIC_PLATFORM_MELLANOX],
-        AC_DEFINE([MELLANOX], [1], [Define to 1 on Mellanox Platform]))
 
 AC_ARG_ENABLE(debug,
 [  --enable-debug          turn on debugging],
diff --git a/syncd/Syncd.cpp b/syncd/Syncd.cpp
index a1aa0e0e4..7c0bd107d 100644
--- a/syncd/Syncd.cpp
+++ b/syncd/Syncd.cpp
@@ -1,4 +1,3 @@
-#include "config.h"
 #include "Syncd.h"
 #include "VidManager.h"
 #include "NotificationHandler.h"
@@ -4708,15 +4707,7 @@ void Syncd::run()
 
     m_mdioIpcServer->stopMdioThread();
 
-    sai_status_t status = SAI_STATUS_SUCCESS;
-#ifdef MELLANOX
-    if (shutdownType != SYNCD_RESTART_TYPE_COLD)
-    {
-        status = removeAllSwitches();
-    }
-#else
-    status = removeAllSwitches();
-#endif
+    sai_status_t status = removeAllSwitches();
 
     // Stop notification thread after removing switch
     m_processor->stopNotificationsProcessingThread();