L3 RRC/NAS developments

src/ue/nas/mm/radio.cpp

@@ -164,18 +164,6 @@ void NasMm::handleActiveCellChange(const Tai &prevTai)
     if (currentCell.hasValue() && !m_storage->equivalentPlmnList->contains(currentCell.plmn))
         m_timers->t3346.stop();
 
-    if (currentCell.hasValue() && prevTai != currentTai)
-    {
-        // "Additionally, the registration attempt counter shall be reset when the UE is in substate
-        // 5GMM-DEREGISTERED.ATTEMPTING-REGISTRATION or 5GMM-REGISTERED.ATTEMPTING-REGISTRATION-UPDATE, and a new
-        // tracking area is entered"
-        if (m_mmSubState == EMmSubState::MM_DEREGISTERED_ATTEMPTING_REGISTRATION ||
-            m_mmSubState == EMmSubState::MM_REGISTERED_ATTEMPTING_REGISTRATION_UPDATE)
-        {
-            resetRegAttemptCounter();
-        }
-    }
-
     if (m_mmState == EMmState::MM_REGISTERED)
     {
         if (currentCell.cellId == 0)
@@ -223,6 +211,18 @@ void NasMm::handleActiveCellChange(const Tai &prevTai)
         m_logger->err("Active cell change in [CM-IDLE] state while MM specific procedure is ongoing");
         switchMmState(EMmSubState::MM_DEREGISTERED_PS);
     }
+
+    if (currentCell.hasValue() && prevTai != currentTai)
+    {
+        // "Additionally, the registration attempt counter shall be reset when the UE is in substate
+        // 5GMM-DEREGISTERED.ATTEMPTING-REGISTRATION or 5GMM-REGISTERED.ATTEMPTING-REGISTRATION-UPDATE, and a new
+        // tracking area is entered"
+        if (m_mmSubState == EMmSubState::MM_DEREGISTERED_ATTEMPTING_REGISTRATION ||
+            m_mmSubState == EMmSubState::MM_REGISTERED_ATTEMPTING_REGISTRATION_UPDATE)
+        {
+            resetRegAttemptCounter();
+        }
+    }
 }
 
 void NasMm::handleRrcConnectionSetup()