[MERGED] osmo-bsc[master]: Revert "Generate the S_L_INP_TEI_UP signal earlier."

2018-03-02 Thread Harald Welte
Harald Welte has submitted this change and it was merged.

Change subject: Revert "Generate the S_L_INP_TEI_UP signal earlier."
..


Revert "Generate the S_L_INP_TEI_UP signal earlier."

This reverts commit faf0982ae20001519cf20c5d6345dad490a135f2, as it
introduces a severe regression: No more BCCH FILL / SACCH INFO are sent
upon RSL establishment to the BTS.  See OS#2719 for more details

Change-Id: I8a4f3be9928bc3a0b61f23dc3e41200105204651
Related: OS#2719
---
M src/libbsc/bts_ipaccess_nanobts.c
1 file changed, 13 insertions(+), 12 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved; Verified



diff --git a/src/libbsc/bts_ipaccess_nanobts.c 
b/src/libbsc/bts_ipaccess_nanobts.c
index 99e178d..cf85961 100644
--- a/src/libbsc/bts_ipaccess_nanobts.c
+++ b/src/libbsc/bts_ipaccess_nanobts.c
@@ -438,11 +438,6 @@
bts->oml_tei, 0);
rc = clock_gettime(CLOCK_MONOTONIC, );
bts->uptime = (rc < 0) ? 0 : tp.tv_sec; /* we don't need 
sub-second precision for uptime */
-   if (!(sign_link->trx->bts->ip_access.flags & OML_UP)) {
-   e1inp_event(sign_link->ts, S_L_INP_TEI_UP,
-   sign_link->tei, sign_link->sapi);
-   sign_link->trx->bts->ip_access.flags |= OML_UP;
-   }
break;
case E1INP_SIGN_RSL: {
struct e1inp_ts *ts;
@@ -463,13 +458,6 @@
e1inp_sign_link_create(ts, E1INP_SIGN_RSL,
   trx, trx->rsl_tei, 0);
trx->rsl_link->ts->sign.delay = 0;
-   if (!(sign_link->trx->bts->ip_access.flags &
-   (RSL_UP << sign_link->trx->nr))) {
-   e1inp_event(sign_link->ts, S_L_INP_TEI_UP,
-   sign_link->tei, sign_link->sapi);
-   sign_link->trx->bts->ip_access.flags |=
-   (RSL_UP << sign_link->trx->nr);
-   }
break;
}
default:
@@ -502,12 +490,25 @@
 {
int ret = 0;
struct e1inp_sign_link *link = msg->dst;
+   struct e1inp_ts *e1i_ts = link->ts;
 
switch (link->type) {
case E1INP_SIGN_RSL:
+   if (!(link->trx->bts->ip_access.flags &
+   (RSL_UP << link->trx->nr))) {
+   e1inp_event(e1i_ts, S_L_INP_TEI_UP,
+   link->tei, link->sapi);
+   link->trx->bts->ip_access.flags |=
+   (RSL_UP << link->trx->nr);
+   }
ret = abis_rsl_rcvmsg(msg);
break;
case E1INP_SIGN_OML:
+   if (!(link->trx->bts->ip_access.flags & OML_UP)) {
+   e1inp_event(e1i_ts, S_L_INP_TEI_UP,
+   link->tei, link->sapi);
+   link->trx->bts->ip_access.flags |= OML_UP;
+   }
ret = abis_nm_rcvmsg(msg);
break;
default:

-- 
To view, visit https://gerrit.osmocom.org/7063
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8a4f3be9928bc3a0b61f23dc3e41200105204651
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder


osmo-bsc[master]: Revert "Generate the S_L_INP_TEI_UP signal earlier."

2018-03-02 Thread Harald Welte

Patch Set 1: Code-Review+2 Verified+1

-- 
To view, visit https://gerrit.osmocom.org/7063
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I8a4f3be9928bc3a0b61f23dc3e41200105204651
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No


[PATCH] osmo-bsc[master]: Revert "Generate the S_L_INP_TEI_UP signal earlier."

2018-03-02 Thread Harald Welte

Review at  https://gerrit.osmocom.org/7063

Revert "Generate the S_L_INP_TEI_UP signal earlier."

This reverts commit faf0982ae20001519cf20c5d6345dad490a135f2, as it
introduces a severe regression: No more BCCH FILL / SACCH INFO are sent
upon RSL establishment to the BTS.  See OS#2719 for more details

Change-Id: I8a4f3be9928bc3a0b61f23dc3e41200105204651
Related: OS#2719
---
M src/libbsc/bts_ipaccess_nanobts.c
1 file changed, 13 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/63/7063/1

diff --git a/src/libbsc/bts_ipaccess_nanobts.c 
b/src/libbsc/bts_ipaccess_nanobts.c
index 99e178d..cf85961 100644
--- a/src/libbsc/bts_ipaccess_nanobts.c
+++ b/src/libbsc/bts_ipaccess_nanobts.c
@@ -438,11 +438,6 @@
bts->oml_tei, 0);
rc = clock_gettime(CLOCK_MONOTONIC, );
bts->uptime = (rc < 0) ? 0 : tp.tv_sec; /* we don't need 
sub-second precision for uptime */
-   if (!(sign_link->trx->bts->ip_access.flags & OML_UP)) {
-   e1inp_event(sign_link->ts, S_L_INP_TEI_UP,
-   sign_link->tei, sign_link->sapi);
-   sign_link->trx->bts->ip_access.flags |= OML_UP;
-   }
break;
case E1INP_SIGN_RSL: {
struct e1inp_ts *ts;
@@ -463,13 +458,6 @@
e1inp_sign_link_create(ts, E1INP_SIGN_RSL,
   trx, trx->rsl_tei, 0);
trx->rsl_link->ts->sign.delay = 0;
-   if (!(sign_link->trx->bts->ip_access.flags &
-   (RSL_UP << sign_link->trx->nr))) {
-   e1inp_event(sign_link->ts, S_L_INP_TEI_UP,
-   sign_link->tei, sign_link->sapi);
-   sign_link->trx->bts->ip_access.flags |=
-   (RSL_UP << sign_link->trx->nr);
-   }
break;
}
default:
@@ -502,12 +490,25 @@
 {
int ret = 0;
struct e1inp_sign_link *link = msg->dst;
+   struct e1inp_ts *e1i_ts = link->ts;
 
switch (link->type) {
case E1INP_SIGN_RSL:
+   if (!(link->trx->bts->ip_access.flags &
+   (RSL_UP << link->trx->nr))) {
+   e1inp_event(e1i_ts, S_L_INP_TEI_UP,
+   link->tei, link->sapi);
+   link->trx->bts->ip_access.flags |=
+   (RSL_UP << link->trx->nr);
+   }
ret = abis_rsl_rcvmsg(msg);
break;
case E1INP_SIGN_OML:
+   if (!(link->trx->bts->ip_access.flags & OML_UP)) {
+   e1inp_event(e1i_ts, S_L_INP_TEI_UP,
+   link->tei, link->sapi);
+   link->trx->bts->ip_access.flags |= OML_UP;
+   }
ret = abis_nm_rcvmsg(msg);
break;
default:

-- 
To view, visit https://gerrit.osmocom.org/7063
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a4f3be9928bc3a0b61f23dc3e41200105204651
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Harald Welte