pespin submitted this change.

View Change

system_information: Move all si13 specific val update to generate_si13()

Change-Id: I6e920d1c8d8e1673194c88929586e8a1f22e09c5
---
M src/osmo-bsc/system_information.c
1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c
index 45f9860..797c556 100644
--- a/src/osmo-bsc/system_information.c
+++ b/src/osmo-bsc/system_information.c
@@ -1255,11 +1255,21 @@
 	/* Information about the other SIs */
 	si13_default.bcch_change_mark = bts->bcch_change_mark;
 
-	/* Whether EGPRS capable MSs shall use EGPRS PACKET CHANNEL REQUEST */
-	if (bts->gprs.egprs_pkt_chan_request && si13_default.cell_opts.ext_info.egprs_supported)
-		si13_default.cell_opts.ext_info.use_egprs_p_ch_req = 1;
-	else
+	switch (bts->gprs.mode) {
+	case BTS_GPRS_EGPRS:
+		si13_default.cell_opts.ext_info.egprs_supported = 1;
+		/* Whether EGPRS capable MSs shall use EGPRS PACKET CHANNEL REQUEST */
+		if (bts->gprs.egprs_pkt_chan_request)
+			si13_default.cell_opts.ext_info.use_egprs_p_ch_req = 1;
+		else
+			si13_default.cell_opts.ext_info.use_egprs_p_ch_req = 0;
+		break;
+	case BTS_GPRS_GPRS:
+	case BTS_GPRS_NONE:
+		si13_default.cell_opts.ext_info.egprs_supported = 0;
 		si13_default.cell_opts.ext_info.use_egprs_p_ch_req = 0;
+		break;
+	}
 
 	if (osmo_bts_has_feature(&bts->features, BTS_FEAT_PAGING_COORDINATION))
 		si13_default.cell_opts.ext_info.bss_paging_coordination = 1;
@@ -1306,16 +1316,11 @@
 
 	switch (bts->gprs.mode) {
 	case BTS_GPRS_EGPRS:
-		si_info.gprs_ind.present = 1;
-		si13_default.cell_opts.ext_info.egprs_supported = 1;
-		break;
 	case BTS_GPRS_GPRS:
 		si_info.gprs_ind.present = 1;
-		si13_default.cell_opts.ext_info.egprs_supported = 0;
 		break;
 	case BTS_GPRS_NONE:
 		si_info.gprs_ind.present = 0;
-		si13_default.cell_opts.ext_info.egprs_supported = 0;
 		break;
 	}
 

To view, visit change 27541. To unsubscribe, or for help writing mail filters, visit settings.