Skip to content

Commit 16f47b7

Browse files
Revert "[nvidia] Skip SAI discovery on ports (#1416)" (#1595)
This reverts commit 0f3b34e. PR #1559 is merged, so we can revert skip on nvidia. Not having separate code path is good for unit testing and general maintainability of the code.
1 parent d7c1de8 commit 16f47b7

3 files changed

Lines changed: 0 additions & 15 deletions

File tree

syncd/Makefile.am

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@ if SONIC_ASIC_PLATFORM_BROADCOM
8383
libSyncd_a_CXXFLAGS += -DMDIO_ACCESS_USE_NPU
8484
endif
8585

86-
if SONIC_ASIC_PLATFORM_MELLANOX
87-
libSyncd_a_CPPFLAGS += -DSKIP_SAI_PORT_DISCOVERY
88-
endif
89-
9086
libSyncdRequestShutdown_a_SOURCES = \
9187
RequestShutdown.cpp \
9288
RequestShutdownCommandLineOptions.cpp \

syncd/SaiDiscovery.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,6 @@ void SaiDiscovery::discover(
114114
discovered.insert(rid);
115115
}
116116

117-
#ifdef SKIP_SAI_PORT_DISCOVERY
118-
if (ot == SAI_OBJECT_TYPE_PORT)
119-
{
120-
return;
121-
}
122-
#endif
123-
124117
const sai_object_type_info_t *info = sai_metadata_get_object_type_info(ot);
125118

126119
/*

syncd/Syncd.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,6 @@ Syncd::Syncd(
233233

234234
m_breakConfig = BreakConfigParser::parseBreakConfig(m_commandLineOptions->m_breakConfig);
235235

236-
#ifdef SKIP_SAI_PORT_DISCOVERY
237-
SWSS_LOG_WARN("SAI discovery is skipped on ports");
238-
#endif
239-
240236
SWSS_LOG_NOTICE("syncd started");
241237
}
242238

0 commit comments

Comments
 (0)