small changes after merge with develop

cmake_targets/CMakeLists.txt

@@ -1892,10 +1892,12 @@ add_executable(lte-softmodem-nos1
 target_link_libraries (lte-softmodem-nos1
   -Wl,--start-group
   RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${ITTI_LIB} ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
-  -Wl,--end-group )
+  NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB
+  NFAPI_USER_LIB
+  -Wl,--end-group z dl )
 
 target_link_libraries (lte-softmodem-nos1 ${LIBXML2_LIBRARIES})
-target_link_libraries (lte-softmodem-nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES}   ${XFORMS_LIBRARIES} ${PROTOBUF_LIB} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES})
+target_link_libraries (lte-softmodem-nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp  ${XFORMS_LIBRARIES} ${PROTOBUF_LIB} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES})
 target_link_libraries (lte-softmodem-nos1  ${LIB_LMS_LIBRARIES})
 target_link_libraries (lte-softmodem-nos1 ${T_LIB})
 

openair2/LAYER2/MAC/config.c

@@ -514,6 +514,7 @@ config_sib2(int Mod_idP,
       else
 	cfg->srs_config.max_up_pts.value = 0;
     }
+  }
 #ifdef Rel14
   if (RC.mac[Mod_idP]->common_channels[CC_idP].mib->message.schedulingInfoSIB1_BR_r13 > 0) {
     AssertFatal(radioResourceConfigCommon_BRP != NULL,
@@ -640,6 +641,7 @@ config_dedicated_scell(int Mod_idP,
 
 }
 
+
 int
 rrc_mac_config_req_eNB(module_id_t Mod_idP,
 		       int CC_idP,
@@ -930,7 +932,7 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
 		  mbms_SessionList[i]->list.count);
     }
   }
-  }
+
 #endif
     
     LOG_E(MAC, "%s() %s:%d RC.mac[Mod_idP]->if_inst->PHY_config_req:%p\n", __FUNCTION__, __FILE__, __LINE__, RC.mac[Mod_idP]->if_inst->PHY_config_req);
@@ -961,6 +963,7 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
     return(0);			   
 }
 
+
 int
 rrc_mac_config_req_ue(module_id_t Mod_idP,
 		      int CC_idP,