pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34293?usp=email )

Change subject: oml: ipacc: Remove BSSGP value assignment being overwritten afterwards ......................................................................

oml: ipacc: Remove BSSGP value assignment being overwritten afterwards

bts->gprs.cell.timer is initialized during BTS allocation from bts_cell_timer_default.

Later on, during nanobts_gen_set_nse_attr(), the same default values are applied to an internal buffer and immedately later overwritten by the content of bts->gprs.cell.timer.

Hence, drop the temporary assignment since it gets overwritten and is basically a NO-OP.

This is only an intermediate one-step-at-a-time commit, since anyway that arrive has to be convertd to osmocom tdef, etc.

Change-Id: I2a170093e62f726e594d3b9c456087f47d2b4198 --- M src/osmo-bsc/bts.c M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c 2 files changed, 36 insertions(+), 15 deletions(-)

Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve

diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index bd61501..814ba41 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -117,8 +117,20 @@ return 0; }

-static const uint8_t bts_cell_timer_default[] = - { 3, 3, 3, 3, 3, 10, 3, 10, 3, 10, 3 }; +static const uint8_t bts_cell_timer_default[11] = { + 3, /* blocking timer (T1) */ + 3, /* blocking retries */ + 3, /* unblocking retries */ + 3, /* reset timer (T2) */ + 3, /* reset retries */ + 10, /* suspend timer (T3) in 100ms */ + 3, /* suspend retries */ + 10, /* resume timer (T4) in 100ms */ + 3, /* resume retries */ + 10, /* capability update timer (T5) */ + 3, /* capability update retries */ +}; + static const struct gprs_rlc_cfg rlc_cfg_default = { .parameter = { [RLC_T3142] = 20, diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c index 9fdbf43..62a6dfb 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c @@ -128,19 +128,6 @@ memcpy(buf, bts_sm->gprs.nse.timer, ARRAY_SIZE(bts_sm->gprs.nse.timer)); msgb_tl16v_put(msgb, NM_ATT_IPACC_NS_CFG, 7, buf);

- /* all timers in seconds */ - buf[0] = 3; /* blockimg timer (T1) */ - buf[1] = 3; /* blocking retries */ - buf[2] = 3; /* unblocking retries */ - buf[3] = 3; /* reset timer (T2) */ - buf[4] = 3; /* reset retries */ - buf[5] = 10; /* suspend timer (T3) in 100ms */ - buf[6] = 3; /* suspend retries */ - buf[7] = 10; /* resume timer (T4) in 100ms */ - buf[8] = 3; /* resume retries */ - buf[9] = 10; /* capability update timer (T5) */ - buf[10] = 3; /* capability update retries */ - OSMO_ASSERT(ARRAY_SIZE(bts->gprs.cell.timer) < sizeof(buf)); memcpy(buf, bts->gprs.cell.timer, ARRAY_SIZE(bts->gprs.cell.timer)); msgb_tl16v_put(msgb, NM_ATT_IPACC_BSSGP_CFG, 11, buf);