undo/redo ecb681c because it intersects poorly with other paging func…

…tions
althea-net · Mar 6, 2024 · f3278e1 · f3278e1
1 parent 9d6d142
commit f3278e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/src/mme/mme-s11-handler.c b/src/mme/mme-s11-handler.c
@@ -1574,10 +1574,8 @@ void mme_s11_handle_downlink_data_notification(
             enb_ue_t *enb_ue = enb_ue_cycle(mme_ue->enb_ue);
             ogs_assert(enb_ue);
 
-            mme_ue->paging.data = bearer;
-            // we are not calling MME_STORE_PAGING_INFO because we
-            // have not yet started paging, but we still need to keep
-            // a pointer to the relevant bearer to build the ACK later
+	    MME_STORE_PAGING_INFO(mme_ue,
+                MME_PAGING_TYPE_DOWNLINK_DATA_NOTIFICATION, bearer);
 
             r = s1ap_send_ue_context_release_command(enb_ue,
                     S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,

diff --git a/src/mme/s1ap-handler.c b/src/mme/s1ap-handler.c
@@ -1663,15 +1663,6 @@ void s1ap_handle_ue_context_release_action(enb_ue_t *enb_ue)
         }
         enb_ue_unlink(mme_ue);
 
-        mme_bearer_t *bearer = mme_bearer_cycle(mme_ue->paging.data);
-        if (!bearer) {
-            ogs_error("Bearer is outdated, cannot page");
-            MME_CLEAR_PAGING_INFO(mme_ue);
-            return;
-        }
-
-        MME_STORE_PAGING_INFO(mme_ue,
-            MME_PAGING_TYPE_DOWNLINK_DATA_NOTIFICATION, bearer);
         r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
         ogs_expect(r == OGS_OK);
         ogs_assert(r != OGS_ERROR);