L3 RRC/NAS developments

src/ue/nas/mm/base.cpp

@@ -147,10 +147,6 @@ void NasMm::performMmCycle()
     if (m_mmSubState == EMmSubState::MM_DEREGISTERED_NORMAL_SERVICE && !m_timers->t3346.isRunning())
         initialRegistrationRequired(EInitialRegCause::MM_DEREG_NORMAL_SERVICE);
 
-    /* Check for uplink data pending */
-    if (m_sm->anyUplinkDataPending() || missingSessionBearer())
-        serviceRequestRequiredForData();
-
     /* Process TAI changes if any */
     if (currentTai.hasValue() &&
         !nas::utils::TaiListContains(m_storage->taiList->get(), nas::VTrackingAreaIdentity{currentTai}))

src/ue/nas/sm/resource.cpp

@@ -64,6 +64,9 @@ void NasSm::handleUplinkStatusChange(int psi, bool isPending)
     m_logger->debug("Uplink data status changed PSI[%d] pending[%s]", psi, isPending ? "true" : "false");
     m_pduSessions[psi]->uplinkPending = isPending;
 
+    if (isPending)
+        m_mm->serviceRequestRequiredForData();
+
     m_mm->triggerMmCycle();
 }