Merge branch 'master' into next

cmake/modules/SRSLTEVersion.cmake

@@ -20,5 +20,5 @@
 
 SET(SRSLTE_VERSION_MAJOR 18)
 SET(SRSLTE_VERSION_MINOR 6)
-SET(SRSLTE_VERSION_PATCH 0)
+SET(SRSLTE_VERSION_PATCH 1)
 SET(SRSLTE_VERSION_STRING "${SRSLTE_VERSION_MAJOR}.${SRSLTE_VERSION_MINOR}.${SRSLTE_VERSION_PATCH}")

srsenb/enb.conf.example

@@ -12,6 +12,7 @@
 # mnc:            Mobile Network Code
 # mme_addr:       IP address of MME for S1 connnection
 # gtp_bind_addr:  Local IP address to bind for GTP connection
+# s1c_bind_addr:  Local IP address to bind for S1AP connection
 # n_prb:          Number of Physical Resource Blocks (6,15,25,50,75,100)
 # tm:             Transmission mode 1-4 (TM1 default)
 # nof_ports:      Number of Tx ports (1 port default, set to 2 for TM2/3/4)
@@ -112,7 +113,7 @@ filename = /tmp/enb.pcap
 #                If set to negative, a single log file will be created.
 #####################################################################
 [log]
-all_level = info
+all_level = warning
 all_hex_limit = 32
 filename = /tmp/enb.log
 file_max_size = -1

srsenb/src/mac/mac.cc

@@ -734,7 +734,8 @@ int mac::get_mch_sched(bool is_mcch, dl_sched_t *dl_sched_res)
         dl_sched_res->sched_grants[0].data[0] = ue_db[SRSLTE_MRNTI]->generate_mch_pdu(mch, 1, mcs_data.tbs/8);
       }
     } else {
-      //TRANSMIT NOTHING
+      dl_sched_res->sched_grants[0].rnti = 0;
+      dl_sched_res->sched_grants[0].data[0] = NULL;
     }
     mch.current_sf_allocation_num++;
   }

srsue/src/ue_base.cc

@@ -133,6 +133,9 @@ std::string ue_base::get_build_mode()
 
 std::string ue_base::get_build_info()
 {
+  if (std::string(srslte_get_build_info()) == "") {
+    return std::string(srslte_get_version());
+  }
   return std::string(srslte_get_build_info());
 }
 

srsue/ue.conf.example

@@ -77,7 +77,7 @@ nas_filename = /tmp/nas.pcap
 #                If set to negative, a single log file will be created.
 #####################################################################
 [log]
-all_level = info
+all_level = warning
 phy_lib_level = none
 all_hex_limit = 32
 filename = /tmp/ue.log