laforge submitted this change.

View Change

nokia_site: change RSL bootstrap logic

Wait for BTS_CONF_COMPL and start RSL bootstrap after.
This way the TRX SW load has enough time to complete and the RSL LAPD becomes available.
Important for MetroSite, UltraSite BTS types.

Change-Id: I7319a64f069d239a582547bc422058ff5848d2e2
Signed-off-by: csaba.sipos <metro4@freemail.hu>
---
M src/osmo-bsc/bts_nokia_site.c
1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c
index 688a8a4..14d4388 100644
--- a/src/osmo-bsc/bts_nokia_site.c
+++ b/src/osmo-bsc/bts_nokia_site.c
@@ -1731,27 +1731,6 @@
 			osmo_timer_setup(&bts->nokia.reset_timer, reset_timer_cb, bts);
 			osmo_timer_schedule(&bts->nokia.reset_timer, 0, 0);
 		}
-
-		/* ACK for CONF DATA message ? */
-		if (bts->nokia.configured != 0) {
-			/* start TRX  (RSL link) */
-
-			struct gsm_e1_subslot *e1_link =
-					&sign_link->trx->rsl_e1_link;
-			struct e1inp_line *line;
-
-			bts->nokia.configured = 0;
-
-			/* RSL Link */
-			line = e1inp_line_find(e1_link->e1_nr);
-			if (!line) {
-				LOG_BTS(bts, DLINP, LOGL_ERROR, "RSL link referring to "
-					"non-existing E1 line %u\n", e1_link->e1_nr);
-				return -ENOMEM;
-			}
-			/* start TRX */
-			start_sabm_in_line(line, 1, SAPI_RSL);	/* start only RSL */
-		}
 		break;
 	case NOKIA_MSG_STATE_CHANGED:
 		/* send ACK */
@@ -1760,6 +1739,21 @@
 	case NOKIA_MSG_CONF_COMPLETE:
 		/* send ACK */
 		abis_nm_ack(bts, ref);
+		if (bts->nokia.configured != 0) {
+			/* start TRX  (RSL link) */
+			struct gsm_e1_subslot *e1_link = &sign_link->trx->rsl_e1_link;
+			struct e1inp_line *line;
+			bts->nokia.configured = 0;
+			/* RSL Link */
+			line = e1inp_line_find(e1_link->e1_nr);
+			if (!line) {
+					LOG_BTS(bts, DLINP, LOGL_ERROR, "RSL link referring to "
+						"non-existing E1 line %u\n", e1_link->e1_nr);
+					return -ENOMEM;
+			}
+			/* start TRX */
+			start_sabm_in_line(line, 1, SAPI_RSL);  /* start only RSL */
+		}
 		/* fake 12.21 OM */
 		nokia_abis_nm_fake_1221_ok(bts);
 		break;

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