Merge branch 'develop' into feature-34-test_framework

openair1/PHY/LTE_TRANSPORT/pucch.c

@@ -1077,7 +1077,7 @@ int32_t rx_pucch_emul(PHY_VARS_eNB *phy_vars_eNB,
   }
 
   if (UE_id==NB_UE_INST) {
-    LOG_E(PHY,"rx_pucch_emul: FATAL, didn't find UE with rnti %x\n",rnti);
+    LOG_W(PHY,"rx_pucch_emul: Didn't find UE with rnti %x\n",rnti);
     return(-1);
   }
 

openair2/LAYER2/MAC/eNB_scheduler_primitives.c

@@ -1101,8 +1101,9 @@ boolean_t CCE_allocation_infeasible(int module_idP,
     DCI_pdu->Num_ue_spec_dci++;
     ret = allocate_CCEs(module_idP,CC_idP,subframe,1);
     if (ret==-1)
-      res = FALSE;
+      res = TRUE;
     DCI_pdu->Num_ue_spec_dci--;
   }
+  return(res);
 }