From 7b7308ac1b13e5fa4119bc2e1d27c2bce93ddc93 Mon Sep 17 00:00:00 2001
From: Jason Tang <jtang613@gmail.com>
Date: Thu, 19 Mar 2020 10:00:58 +0000
Subject: [PATCH] Fix CSFB

---
 srsenb/sib.conf.example     | 39 +++++++++++++++++++++++++++----------
 srsenb/src/stack/rrc/rrc.cc |  1 -
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/srsenb/sib.conf.example b/srsenb/sib.conf.example
index 4990241da..253d4dc4d 100644
--- a/srsenb/sib.conf.example
+++ b/srsenb/sib.conf.example
@@ -9,6 +9,7 @@ sib1 =
     (
         {
             si_periodicity = 16;
+
             // comma-separated array of SIB-indexes (from 3 to 13), leave empty or commented to just scheduler sib2
             si_mapping_info = [ 3 ];
         }
@@ -119,19 +120,37 @@ sib2 =
 sib3 =
 {
     cell_reselection_common = {
-      q_hyst = 2; // in dB
+        q_hyst = 2; // in dB
     },
     cell_reselection_serving = {
-      s_non_intra_search = 3,
-      thresh_serving_low = 2,
-      cell_resel_prio = 6
+        s_non_intra_search = 3,
+        thresh_serving_low = 2,
+        cell_resel_prio = 6
     },
     intra_freq_reselection = {
-      q_rx_lev_min = -61,
-      p_max = 23,
-      s_intra_search = 5,
-      presence_ant_port_1 = true,
-      neigh_cell_cnfg = 1,
-      t_resel_eutra = 1
+        q_rx_lev_min = -61,
+        p_max = 23,
+        s_intra_search = 5,
+        presence_ant_port_1 = true,
+        neigh_cell_cnfg = 1,
+        t_resel_eutra = 1
     }
 };
+
+sib7 =
+{
+    t_resel_geran = 1;
+    carrier_freqs_info_list =
+    (
+        {
+            cell_resel_prio = 0;
+            ncc_permitted = 255;
+            q_rx_lev_min = 0;
+            thresh_x_high = 2;
+            thresh_x_low = 2;
+
+            start_arfcn = 871;
+            band_ind = "dcs1800";
+        }
+    );
+};
\ No newline at end of file
diff --git a/srsenb/src/stack/rrc/rrc.cc b/srsenb/src/stack/rrc/rrc.cc
index 5688c4782..d97c5a60e 100644
--- a/srsenb/src/stack/rrc/rrc.cc
+++ b/srsenb/src/stack/rrc/rrc.cc
@@ -361,7 +361,6 @@ bool rrc::modify_ue_ctxt(uint16_t rnti, const asn1::s1ap::ue_context_mod_request
   }
   if (msg.protocol_ies.registered_lai_present) {
     rrc_log->warning("Not handling RegisteredLAI\n");
-    err = true;
   }
   if (msg.protocol_ies.subscriber_profile_idfor_rfp_present) {
     rrc_log->warning("Not handling SubscriberProfileIDforRFP\n");