From 579daeb913b4b25c4862762847faa7efc7512de7 Mon Sep 17 00:00:00 2001
From: Nivedita Sarkar <nivedita_sarkar@apple.com>
Date: Mon, 6 Nov 2023 12:17:16 -0800
Subject: [PATCH] Do not set systemLayer to null

---
 .../clusters/diagnostic-logs-server/diagnostic-logs-server.cpp  | 1 +
 src/protocols/bdx/TransferFacilitator.cpp                       | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp b/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp
index 91b1ff5554cba4..19cdad18e6db45 100644
--- a/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp
+++ b/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp
@@ -24,6 +24,7 @@
 #include <app/CommandHandlerInterface.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/InteractionModelEngine.h>
+#include <app/util/config.h>
 #include <lib/support/ScopedBuffer.h>
 #include <messaging/ExchangeContext.h>
 
diff --git a/src/protocols/bdx/TransferFacilitator.cpp b/src/protocols/bdx/TransferFacilitator.cpp
index 604eec88d40975..fbe563187b6fb9 100644
--- a/src/protocols/bdx/TransferFacilitator.cpp
+++ b/src/protocols/bdx/TransferFacilitator.cpp
@@ -114,7 +114,6 @@ CHIP_ERROR Responder::PrepareForTransfer(System::Layer * layer, TransferRole rol
 void Responder::ResetTransfer()
 {
     mTransfer.Reset();
-    mSystemLayer = nullptr;
     ChipLogProgress(BDX, "Stop polling for messages");
     mStopPolling = true;
 }
@@ -136,7 +135,6 @@ CHIP_ERROR Initiator::InitiateTransfer(System::Layer * layer, TransferRole role,
 void Initiator::ResetTransfer()
 {
     mTransfer.Reset();
-    mSystemLayer = nullptr;
     ChipLogProgress(BDX, "Stop polling for messages");
     mStopPolling = true;
 }