From 44488344133bf55d3d17deb2b4b62c17a77862a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Kr=C3=B3lik?=
 <66667989+Damian-Nordic@users.noreply.github.com>
Date: Wed, 30 Mar 2022 14:33:14 +0200
Subject: [PATCH] [zephyr] Fix re-joining multicast groups (#16703)

---
 src/app/server/Server.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
index 3c550350934d6e..346631b6d457a3 100644
--- a/src/app/server/Server.cpp
+++ b/src/app/server/Server.cpp
@@ -255,11 +255,11 @@ CHIP_ERROR Server::Init(AppDelegate * delegate, uint16_t secureServicePort, uint
     // This code is necessary to restart listening to existing groups after a reboot
     // Each manufacturer needs to validate that they can rejoin groups by placing this code at the appropriate location for them
     //
-    // This is disabled for thread device because the same code is already present for thread devices in
+    // Thread LWIP devices using dedicated Inet endpoint implementations are excluded because they call this function from:
     // src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.cpp
-#if !CHIP_DEVICE_CONFIG_ENABLE_THREAD
+#if !CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
     RejoinExistingMulticastGroups();
-#endif // !CHIP_DEVICE_CONFIG_ENABLE_THREAD
+#endif // !CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
 
     PlatformMgr().HandleServerStarted();