From 70e754e1db136751b237f43a2694e303e0bb11a3 Mon Sep 17 00:00:00 2001
From: Prince George <prgeor@microsoft.com>
Date: Fri, 6 May 2022 02:29:48 +0000
Subject: [PATCH] Force DP to remain in DpInitialized State state on admin
 shutdown

---
 sonic-xcvrd/xcvrd/xcvrd.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sonic-xcvrd/xcvrd/xcvrd.py b/sonic-xcvrd/xcvrd/xcvrd.py
index 62192394b..5a3b51287 100644
--- a/sonic-xcvrd/xcvrd/xcvrd.py
+++ b/sonic-xcvrd/xcvrd/xcvrd.py
@@ -1260,6 +1260,8 @@ def task_worker(self):
                            self.log_notice("{} Forcing Tx laser OFF".format(lport))
                            # Force DataPath re-init
                            api.tx_disable_channel(host_lanes, True)
+                           self.port_dict[lport]['cmis_state'] = self.CMIS_STATE_READY
+                           continue
 
                         appl = self.get_cmis_application_desired(api, host_lanes, host_speed)
                         if appl < 1: