Merge remote-tracking branch 'origin/nr-ip-over-LTE-stack' into integration_develop-nr_2019w42

Conflicts:
	executables/nr-softmodem.c
	executables/nr-softmodem.h
	targets/ARCH/rfsimulator/simulator.c
This commit is contained in:
Florian Kaltenberger
2019-10-14 13:40:03 +02:00
32 changed files with 1146 additions and 232 deletions
+1
View File
@@ -92,6 +92,7 @@ void get_common_options(void) {
}
if (nokrnmod) {
printf("nokrnmod bit enabled \n");
set_softmodem_optmask(SOFTMODEM_NOKRNMOD_BIT);
}