compilation success after merge with master + corrections

openair2/LAYER2/MAC/config_ue.c

@@ -136,9 +136,10 @@ rrc_mac_config_req_ue(module_id_t Mod_idP,
 		      , uint8_t num_active_cba_groups, uint16_t cba_rnti
 #endif
 #if defined(Rel14)
-		      ,config_action_t config_action
-		      ,const uint32_t * const sourceL2Id
-		      ,const uint32_t * const destinationL2Id,
+		      ,config_action_t config_action,
+		      const uint32_t * const sourceL2Id,
+		      const uint32_t * const destinationL2Id,
+                      const uint32_t * const groupL2Id,
 		      SL_Preconfiguration_r12_t *SL_Preconfiguration_r12,
 		      uint32_t directFrameNumber_r12,
 		      long directSubframeNumber_r12,

openair2/LAYER2/MAC/proto.h

@@ -1030,6 +1030,7 @@ int rrc_mac_config_req_ue(module_id_t module_idP,
 			  ,config_action_t config_action,
 			  const uint32_t * const sourceL2Id,
 			  const uint32_t * const destinationL2Id,
+                          const uint32_t * const groupL2Id,
 			  SL_Preconfiguration_r12_t *SL_Preconfiguration_r12_t,
 			  uint32_t directFrame_r12,
 			  long directSubframe_r12,

openair2/LAYER2/MAC/ue_procedures.c

@@ -539,7 +539,6 @@ ue_send_sdu(module_id_t module_idP,
                        CCCH,
                        (uint8_t*)payload_ptr,
                        rx_lengths[i],
-                       ENB_FLAG_NO,
                        eNB_index,
                        0);
 
@@ -802,7 +801,7 @@ ue_send_mch_sdu(module_id_t module_idP, uint8_t CC_id, frame_t frameP,
 
 		mac_rlc_data_ind(module_idP, UE_mac_inst[module_idP].crnti, eNB_index, frameP, ENB_FLAG_NO, MBMS_FLAG_YES, MTCH,	/*+ (maxDRB + 3), */
 				 (char *) payload_ptr, rx_lengths[i], 1,
-				 NULL,
+				 NULL
 #ifdef Rel14
                                    ,SL_RESET_RLC_FLAG_NO
 #endif
@@ -864,7 +863,6 @@ void ue_send_sl_sdu(module_id_t module_idP,
             lcid = UE_mac_inst[module_idP].sl_info[i].LCID;
             break;
          }
->>>>>>> origin
 
       for (j = 0; j< MAX_NUM_LCID; j++){
          if ((longh->LCID < MAX_NUM_LCID_DATA) && (j < MAX_NUM_LCID_DATA)){
@@ -962,7 +960,6 @@ void ue_send_sl_sdu(module_id_t module_idP,
             SL_DISCOVERY,
             sdu, //(uint8_t*)&UE_mac_inst[Mod_id].SL_Discovery[0].Rx_buffer.Payload[0],
             len,
-            ENB_FLAG_NO,
             eNB_index,
             0);