More formatting

openair2/LAYER2/MAC/eNB_scheduler_RA.c

@@ -1614,14 +1614,14 @@ cancel_ra_proc(module_id_t module_idP, int CC_id, frame_t frameP,
 	  module_idP, CC_id, frameP, rnti);
 
     for (i = 0; i < NB_RA_PROC_MAX; i++) {
-	if (rnti == ra[i].rnti) {
-	  ra[i].state = IDLE;
-	  ra[i].timing_offset = 0;
-	  ra[i].RRC_timer = 20;
-	  ra[i].rnti = 0;
-	  ra[i].msg3_round = 0;
-    LOG_I(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d Canceled RA procedure for UE rnti %x\n", module_idP, CC_id, frameP, rnti);
-	}
+      if (rnti == ra[i].rnti) {
+        ra[i].state = IDLE;
+        ra[i].timing_offset = 0;
+        ra[i].RRC_timer = 20;
+        ra[i].rnti = 0;
+        ra[i].msg3_round = 0;
+        LOG_I(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d Canceled RA procedure for UE rnti %x\n", module_idP, CC_id, frameP, rnti);
+      }
     }
 }
 

openair2/LAYER2/MAC/eNB_scheduler_primitives.c

@@ -1862,18 +1862,19 @@ int find_UE_id(module_id_t mod_idP, rnti_t rntiP)
 int find_RA_id(module_id_t mod_idP, int CC_idP, rnti_t rntiP)
 //------------------------------------------------------------------------------
 {
-  int RA_id;
   AssertFatal(RC.mac[mod_idP], "RC.mac[%d] is null\n", mod_idP);
-  RA_t *ra = (RA_t *) & RC.mac[mod_idP]->common_channels[CC_idP].ra[0];
 
-  for (RA_id = 0; RA_id < NB_RA_PROC_MAX; RA_id++) {
-    LOG_D(MAC,
-          "Checking RA_id %d for %x : state %d\n",
-          RA_id, rntiP, ra[RA_id].state);
+  RA_t *ra_ptr = RC.mac[mod_idP]->common_channels[CC_idP].ra;
+
+  for (int RA_id = 0; RA_id < NB_RA_PROC_MAX; RA_id++, ra_ptr++) {
+    LOG_D(MAC, "Checking RA_id %d for %x : state %d\n",
+      RA_id, 
+      rntiP, 
+      ra_ptr[RA_id].state);
 
-    if (ra[RA_id].state != IDLE &&
-        ra[RA_id].rnti == rntiP)
+    if ((ra_ptr->state != IDLE) && (ra_ptr->rnti == rntiP)) {
       return (RA_id);
+    }
   }
 
   return (-1);