Remove DL Slicing-related variables

openair2/ENB_APP/flexran_agent_ran_api.c

@@ -3016,7 +3016,7 @@ uint32_t flexran_get_rrc_enb_ue_s1ap_id(mid_t mod_id, rnti_t rnti)
 int flexran_get_ue_dl_slice_id(mid_t mod_id, mid_t ue_id) {
   if (!mac_is_present(mod_id)) return -1;
 
-  int slice_idx = RC.mac[mod_id]->UE_list.assoc_dl_slice_idx[ue_id];
+  int slice_idx = 0; //RC.mac[mod_id]->UE_list.assoc_dl_slice_idx[ue_id];
 
   if (slice_idx >= 0 && slice_idx < RC.mac[mod_id]->slice_info.n_dl)
     return RC.mac[mod_id]->slice_info.dl[slice_idx].id;
@@ -3031,7 +3031,7 @@ void flexran_set_ue_dl_slice_idx(mid_t mod_id, mid_t ue_id, int slice_idx) {
 
   if (!flexran_dl_slice_exists(mod_id, slice_idx)) return;
 
-  RC.mac[mod_id]->UE_list.assoc_dl_slice_idx[ue_id] = slice_idx;
+  //RC.mac[mod_id]->UE_list.assoc_dl_slice_idx[ue_id] = slice_idx;
 }
 
 int flexran_get_ue_ul_slice_id(mid_t mod_id, mid_t ue_id) {
@@ -3103,14 +3103,14 @@ int flexran_remove_dl_slice(mid_t mod_id, int slice_idx) {
 
   memset(&sli->dl[sli->n_dl], 0, sizeof(sli->dl[sli->n_dl]));
   /* all UEs that have been in the old slice are put into slice index 0 */
-  int *assoc_list = RC.mac[mod_id]->UE_list.assoc_dl_slice_idx;
+  //int *assoc_list = RC.mac[mod_id]->UE_list.assoc_dl_slice_idx;
 
-  for (int i = 0; i < MAX_MOBILES_PER_ENB; ++i) {
-    if (assoc_list[i] == slice_idx)
-      assoc_list[i] = 0;
-  }
+  //for (int i = 0; i < MAX_MOBILES_PER_ENB; ++i) {
+  //  if (assoc_list[i] == slice_idx)
+  //    assoc_list[i] = 0;
+  //}
 
-  return sli->n_dl;
+  return 1;
 }
 
 int flexran_get_num_dl_slices(mid_t mod_id) {

openair2/LAYER2/MAC/eNB_scheduler_primitives.c

@@ -2227,7 +2227,6 @@ add_new_ue(module_id_t mod_idP,
            sizeof(eNB_UE_STATS));
     UE_list->UE_sched_ctrl[UE_id].ue_reestablishment_reject_timer = 0;
     /* default slice in case there was something different */
-    UE_list->assoc_dl_slice_idx[UE_id] = 0;
     UE_list->assoc_ul_slice_idx[UE_id] = 0;
     UE_list->UE_sched_ctrl[UE_id].ta_update = 31;
 
@@ -5123,25 +5122,6 @@ nb_rbs_allowed_slice(float rb_percentage,
   return (uint16_t) floor(rb_percentage * total_rbs);
 }
 
-//------------------------------------------------------------------------------
-int
-ue_dl_slice_membership(module_id_t mod_id,
-                       int UE_id,
-                       int slice_idx)
-//------------------------------------------------------------------------------
-{
-  eNB_MAC_INST *eNB = RC.mac[mod_id];
-
-  if (slice_idx < 0 || slice_idx >= eNB->slice_info.n_dl) {
-    LOG_W(MAC, "out of range slice index %d (slice ID %d)\n",
-          slice_idx,
-          eNB->slice_info.dl[slice_idx].id);
-    return 0;
-  }
-
-  return eNB->UE_list.active[UE_id] == TRUE && eNB->UE_list.assoc_dl_slice_idx[UE_id] == slice_idx;
-}
-
 //------------------------------------------------------------------------------
 int
 ue_ul_slice_membership(module_id_t mod_id,

openair2/LAYER2/MAC/mac.h

@@ -932,7 +932,6 @@ typedef struct {
   ///Contention resolution timer used during random access
   uint8_t mac_ContentionResolutionTimer;
 
-  uint16_t max_rbs_allowed_slice[NFAPI_CC_MAX][MAX_NUM_SLICES];
   uint16_t max_rbs_allowed_slice_uplink[NFAPI_CC_MAX][MAX_NUM_SLICES];
 
   uint8_t max_mcs[MAX_NUM_LCID];
@@ -1163,8 +1162,6 @@ typedef struct {
   /// Sorting criteria for the UE list in the MAC preprocessor
   uint16_t sorting_criteria[MAX_NUM_SLICES][CR_NUM];
   uint16_t first_rb_offset[NFAPI_CC_MAX][MAX_NUM_SLICES];
-
-  int assoc_dl_slice_idx[MAX_MOBILES_PER_ENB];
   int assoc_ul_slice_idx[MAX_MOBILES_PER_ENB];
 } UE_list_t;
 

openair2/LAYER2/MAC/mac_proto.h

@@ -1239,7 +1239,6 @@ void pre_scd_nb_rbs_required(    module_id_t     module_idP,
 
 /* Slice related functions */
 uint16_t nb_rbs_allowed_slice(float rb_percentage, int total_rbs);
-int ue_dl_slice_membership(module_id_t mod_id, int UE_id, int slice_idx);
 int ue_ul_slice_membership(module_id_t mod_id, int UE_id, int slice_idx);
 
 /* DRX Configuration */

openair2/LAYER2/MAC/main.c

@@ -59,7 +59,6 @@ void init_UE_list(UE_list_t *UE_list)
   memset(UE_list->eNB_UE_stats, 0, sizeof(UE_list->eNB_UE_stats));
   memset(UE_list->UE_sched_ctrl, 0, sizeof(UE_list->UE_sched_ctrl));
   memset(UE_list->active, 0, sizeof(UE_list->active));
-  memset(UE_list->assoc_dl_slice_idx, 0, sizeof(UE_list->assoc_dl_slice_idx));
   memset(UE_list->assoc_ul_slice_idx, 0, sizeof(UE_list->assoc_ul_slice_idx));
 }