<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22276">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve
  osmith: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Rename 'bts_data' leftovers to 'bts'<br><br>Before, we used tho have a BTs object split into 2 parts, a C<br>gprs_rlcmac_bts struct and a C++ BTS struct, and "bts_data" naming was<br>used to distinguish them in variable names. Nowadays the struct is<br>finally combined into one, so there's no point in using this "bts_data"<br>terminology, we use always "bts".<br><br>Change-Id: I9852bf439292d1abc70711bea65698b21bde0ee8<br>---<br>M src/gprs_rlcmac_sched.cpp<br>M src/gprs_rlcmac_ts_alloc.cpp<br>M src/pcu_l1_if.cpp<br>M src/pcu_vty_functions.cpp<br>M src/pcu_vty_functions.h<br>M src/pdch.cpp<br>M src/pdch.h<br>M src/tbf.cpp<br>M src/tbf.h<br>9 files changed, 40 insertions(+), 55 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp</span><br><span>index 39e22c0..40c194c 100644</span><br><span>--- a/src/gprs_rlcmac_sched.cpp</span><br><span>+++ b/src/gprs_rlcmac_sched.cpp</span><br><span>@@ -130,29 +130,29 @@</span><br><span> }</span><br><span> </span><br><span> struct msgb *sched_app_info(struct gprs_rlcmac_tbf *tbf) {</span><br><span style="color: hsl(0, 100%, 40%);">-   struct gprs_rlcmac_bts *bts_data;</span><br><span style="color: hsl(120, 100%, 40%);">+     struct gprs_rlcmac_bts *bts;</span><br><span>         struct msgb *msg = NULL;</span><br><span> </span><br><span>         if (!tbf || !tbf->ms()->app_info_pending)</span><br><span>              return NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        bts_data = the_pcu->bts;</span><br><span style="color: hsl(120, 100%, 40%);">+   bts = the_pcu->bts;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      if (bts_data->app_info) {</span><br><span style="color: hsl(120, 100%, 40%);">+  if (bts->app_info) {</span><br><span>              LOGP(DRLCMACSCHED, LOGL_DEBUG, "Sending Packet Application Information message\n");</span><br><span style="color: hsl(0, 100%, 40%);">-           msg = msgb_copy(bts_data->app_info, "app_info_msg_sched");</span><br><span style="color: hsl(120, 100%, 40%);">+               msg = msgb_copy(bts->app_info, "app_info_msg_sched");</span><br><span>   } else</span><br><span>               LOGP(DRLCMACSCHED, LOGL_ERROR, "MS has app_info_pending flag set, but no Packet Application Information"</span><br><span>                " message stored in BTS!\n");</span><br><span> </span><br><span>     tbf->ms()->app_info_pending = false;</span><br><span style="color: hsl(0, 100%, 40%);">-      bts_data->app_info_pending--;</span><br><span style="color: hsl(120, 100%, 40%);">+      bts->app_info_pending--;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts_data->app_info_pending) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bts->app_info_pending) {</span><br><span>             LOGP(DRLCMACSCHED, LOGL_DEBUG, "Packet Application Information successfully sent to all MS with active"</span><br><span>                 " TBF\n");</span><br><span style="color: hsl(0, 100%, 40%);">-               msgb_free(bts_data->app_info);</span><br><span style="color: hsl(0, 100%, 40%);">-               bts_data->app_info = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+         msgb_free(bts->app_info);</span><br><span style="color: hsl(120, 100%, 40%);">+          bts->app_info = NULL;</span><br><span>     }</span><br><span>    return msg;</span><br><span> }</span><br><span>diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp</span><br><span>index f8b1c1f..4c68a87 100644</span><br><span>--- a/src/gprs_rlcmac_ts_alloc.cpp</span><br><span>+++ b/src/gprs_rlcmac_ts_alloc.cpp</span><br><span>@@ -239,7 +239,7 @@</span><br><span>  attach_tbf_to_pdch(pdch, tbf);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int find_trx(const struct gprs_rlcmac_bts *bts_data, const GprsMs *ms, int8_t use_trx)</span><br><span style="color: hsl(120, 100%, 40%);">+static int find_trx(const struct gprs_rlcmac_bts *bts, const GprsMs *ms, int8_t use_trx)</span><br><span> {</span><br><span>  unsigned trx_no;</span><br><span>     unsigned ts;</span><br><span>@@ -252,8 +252,8 @@</span><br><span>           return use_trx;</span><br><span> </span><br><span>  /* Find the first TRX that has a PDCH with a free UL and DL TFI */</span><br><span style="color: hsl(0, 100%, 40%);">-      for (trx_no = 0; trx_no < ARRAY_SIZE(bts_data->trx); trx_no += 1) {</span><br><span style="color: hsl(0, 100%, 40%);">-               const struct gprs_rlcmac_trx *trx = &bts_data->trx[trx_no];</span><br><span style="color: hsl(120, 100%, 40%);">+    for (trx_no = 0; trx_no < ARRAY_SIZE(bts->trx); trx_no += 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+          const struct gprs_rlcmac_trx *trx = &bts->trx[trx_no];</span><br><span>                for (ts = 0; ts < ARRAY_SIZE(trx->pdch); ts++) {</span><br><span>                       const struct gprs_rlcmac_pdch *pdch = &trx->pdch[ts];</span><br><span>                         if (!pdch->is_enabled())</span><br><span>@@ -272,14 +272,14 @@</span><br><span>  return -EBUSY;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static bool idle_pdch_avail(const struct gprs_rlcmac_bts *bts_data)</span><br><span style="color: hsl(120, 100%, 40%);">+static bool idle_pdch_avail(const struct gprs_rlcmac_bts *bts)</span><br><span> {</span><br><span>      unsigned trx_no;</span><br><span>     unsigned ts;</span><br><span> </span><br><span>     /* Find the first PDCH with an unused DL TS */</span><br><span style="color: hsl(0, 100%, 40%);">-  for (trx_no = 0; trx_no < ARRAY_SIZE(bts_data->trx); trx_no += 1) {</span><br><span style="color: hsl(0, 100%, 40%);">-               const struct gprs_rlcmac_trx *trx = &bts_data->trx[trx_no];</span><br><span style="color: hsl(120, 100%, 40%);">+    for (trx_no = 0; trx_no < ARRAY_SIZE(bts->trx); trx_no += 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+          const struct gprs_rlcmac_trx *trx = &bts->trx[trx_no];</span><br><span>                for (ts = 0; ts < ARRAY_SIZE(trx->pdch); ts++) {</span><br><span>                       const struct gprs_rlcmac_pdch *pdch = &trx->pdch[ts];</span><br><span>                         if (!pdch->is_enabled())</span><br><span>diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp</span><br><span>index ce0f55e..e5ad1de 100644</span><br><span>--- a/src/pcu_l1_if.cpp</span><br><span>+++ b/src/pcu_l1_if.cpp</span><br><span>@@ -814,36 +814,35 @@</span><br><span> static int pcu_rx_app_info_req(struct gsm_pcu_if_app_info_req *app_info_req)</span><br><span> {</span><br><span>    struct gprs_rlcmac_bts *bts = the_pcu->bts;</span><br><span style="color: hsl(0, 100%, 40%);">-  struct gprs_rlcmac_bts *bts_data = bts;</span><br><span>      struct llist_head *tmp;</span><br><span> </span><br><span>  LOGP(DL1IF, LOGL_DEBUG, "Application Information Request received: type=0x%08x len=%i\n",</span><br><span>       app_info_req->application_type, app_info_req->len);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      bts_data->app_info_pending = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+    bts->app_info_pending = 0;</span><br><span>        llist_for_each(tmp, bts_ms_store(bts)->ms_list()) {</span><br><span>               GprsMs *ms = llist_entry(tmp, typeof(*ms), list);</span><br><span>            if (!ms_dl_tbf(ms))</span><br><span>                  continue;</span><br><span style="color: hsl(0, 100%, 40%);">-               bts_data->app_info_pending++;</span><br><span style="color: hsl(120, 100%, 40%);">+              bts->app_info_pending++;</span><br><span>          ms->app_info_pending = true;</span><br><span>      }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (!bts_data->app_info_pending) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bts->app_info_pending) {</span><br><span>             LOGP(DL1IF, LOGL_NOTICE, "Packet Application Information will not be sent, no subscribers with active"</span><br><span>                  " TBF\n");</span><br><span>            return -1;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (bts_data->app_info) {</span><br><span style="color: hsl(120, 100%, 40%);">+  if (bts->app_info) {</span><br><span>              LOGP(DL1IF, LOGL_NOTICE, "Previous Packet Application Information was not sent to all subscribers,"</span><br><span>                     " overwriting with new one\n");</span><br><span style="color: hsl(0, 100%, 40%);">-          msgb_free(bts_data->app_info);</span><br><span style="color: hsl(120, 100%, 40%);">+             msgb_free(bts->app_info);</span><br><span>         }</span><br><span> </span><br><span>        LOGP(DL1IF, LOGL_INFO, "Sending Packet Application Information to %i subscribers with active TBF\n",</span><br><span style="color: hsl(0, 100%, 40%);">-       bts_data->app_info_pending);</span><br><span style="color: hsl(0, 100%, 40%);">-    bts_data->app_info = gprs_rlcmac_app_info_msg(app_info_req);</span><br><span style="color: hsl(120, 100%, 40%);">+            bts->app_info_pending);</span><br><span style="color: hsl(120, 100%, 40%);">+       bts->app_info = gprs_rlcmac_app_info_msg(app_info_req);</span><br><span>   return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/pcu_vty_functions.cpp b/src/pcu_vty_functions.cpp</span><br><span>index 0e9cc00..231bce7 100644</span><br><span>--- a/src/pcu_vty_functions.cpp</span><br><span>+++ b/src/pcu_vty_functions.cpp</span><br><span>@@ -242,13 +242,13 @@</span><br><span>  return show_ms(vty, ms);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int pcu_vty_show_bts_pdch(struct vty *vty, const struct gprs_rlcmac_bts *bts_data)</span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_vty_show_bts_pdch(struct vty *vty, const struct gprs_rlcmac_bts *bts)</span><br><span> {</span><br><span>      unsigned int trx_nr, ts_nr;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "BTS (%s)%s", bts_data->active ? "active" : "disabled", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">-     for (trx_nr = 0; trx_nr < ARRAY_SIZE(bts_data->trx); trx_nr++) {</span><br><span style="color: hsl(0, 100%, 40%);">-          const struct gprs_rlcmac_trx *trx = &bts_data->trx[trx_nr];</span><br><span style="color: hsl(120, 100%, 40%);">+    vty_out(vty, "BTS (%s)%s", bts->active ? "active" : "disabled", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+        for (trx_nr = 0; trx_nr < ARRAY_SIZE(bts->trx); trx_nr++) {</span><br><span style="color: hsl(120, 100%, 40%);">+             const struct gprs_rlcmac_trx *trx = &bts->trx[trx_nr];</span><br><span> </span><br><span>            for (ts_nr = 0; ts_nr < ARRAY_SIZE(trx->pdch); ts_nr++) {</span><br><span>                      if (trx->pdch[ts_nr].is_enabled())</span><br><span>diff --git a/src/pcu_vty_functions.h b/src/pcu_vty_functions.h</span><br><span>index 4528fb2..a68df27 100644</span><br><span>--- a/src/pcu_vty_functions.h</span><br><span>+++ b/src/pcu_vty_functions.h</span><br><span>@@ -27,13 +27,13 @@</span><br><span> struct vty;</span><br><span> struct gprs_rlcmac_bts;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int pcu_vty_show_tbf_all(struct vty *vty, struct gprs_rlcmac_bts *bts_data, uint32_t flags);</span><br><span style="color: hsl(0, 100%, 40%);">-int pcu_vty_show_ms_all(struct vty *vty, struct gprs_rlcmac_bts *bts_data);</span><br><span style="color: hsl(0, 100%, 40%);">-int pcu_vty_show_ms_by_tlli(struct vty *vty, struct gprs_rlcmac_bts *bts_data,</span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_vty_show_tbf_all(struct vty *vty, struct gprs_rlcmac_bts *bts, uint32_t flags);</span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_vty_show_ms_all(struct vty *vty, struct gprs_rlcmac_bts *bts);</span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_vty_show_ms_by_tlli(struct vty *vty, struct gprs_rlcmac_bts *bts,</span><br><span>  uint32_t tlli);</span><br><span style="color: hsl(0, 100%, 40%);">-int pcu_vty_show_ms_by_imsi(struct vty *vty, struct gprs_rlcmac_bts *bts_data,</span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_vty_show_ms_by_imsi(struct vty *vty, struct gprs_rlcmac_bts *bts,</span><br><span>     const char *imsi);</span><br><span style="color: hsl(0, 100%, 40%);">-int pcu_vty_show_bts_pdch(struct vty *vty, const struct gprs_rlcmac_bts *bts_data);</span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_vty_show_bts_pdch(struct vty *vty, const struct gprs_rlcmac_bts *bts);</span><br><span> #ifdef __cplusplus</span><br><span> }</span><br><span> #endif</span><br><span>diff --git a/src/pdch.cpp b/src/pdch.cpp</span><br><span>index 49f0b85..9dd4072 100644</span><br><span>--- a/src/pdch.cpp</span><br><span>+++ b/src/pdch.cpp</span><br><span>@@ -113,12 +113,12 @@</span><br><span>      }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static inline void sched_ul_ass_or_rej(struct gprs_rlcmac_bts *bts, gprs_rlcmac_bts *bts_data, struct gprs_rlcmac_dl_tbf *tbf)</span><br><span style="color: hsl(120, 100%, 40%);">+static inline void sched_ul_ass_or_rej(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_dl_tbf *tbf)</span><br><span> {</span><br><span>   bts_do_rate_ctr_inc(bts, CTR_CHANNEL_REQUEST_DESCRIPTION);</span><br><span> </span><br><span>       /* This call will register the new TBF with the MS on success */</span><br><span style="color: hsl(0, 100%, 40%);">-        gprs_rlcmac_ul_tbf *ul_tbf = tbf_alloc_ul(bts_data, tbf->ms(), tbf->trx->trx_no, tbf->tlli());</span><br><span style="color: hsl(120, 100%, 40%);">+    gprs_rlcmac_ul_tbf *ul_tbf = tbf_alloc_ul(bts, tbf->ms(), tbf->trx->trx_no, tbf->tlli());</span><br><span> </span><br><span>    /* schedule uplink assignment or reject */</span><br><span>   if (ul_tbf) {</span><br><span>@@ -455,7 +455,7 @@</span><br><span>  }</span><br><span>    /* check for channel request */</span><br><span>      if (ack_nack->Exist_Channel_Request_Description)</span><br><span style="color: hsl(0, 100%, 40%);">-             sched_ul_ass_or_rej(bts(), bts_data(), tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+          sched_ul_ass_or_rej(bts(), tbf);</span><br><span> </span><br><span>         /* get measurements */</span><br><span>       if (tbf->ms()) {</span><br><span>@@ -545,7 +545,7 @@</span><br><span> </span><br><span>        /* check for channel request */</span><br><span>      if (ack_nack->Exist_ChannelRequestDescription)</span><br><span style="color: hsl(0, 100%, 40%);">-               sched_ul_ass_or_rej(bts(), bts_data(), tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+          sched_ul_ass_or_rej(bts(), tbf);</span><br><span> </span><br><span>         /* get measurements */</span><br><span>       if (tbf->ms()) {</span><br><span>@@ -612,9 +612,9 @@</span><br><span>                    tbf_free(ul_tbf);</span><br><span>            }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-           ul_tbf = tbf_alloc_ul(bts_data(), ms, trx_no(), tlli);</span><br><span style="color: hsl(120, 100%, 40%);">+                ul_tbf = tbf_alloc_ul(bts(), ms, trx_no(), tlli);</span><br><span>            if (!ul_tbf) {</span><br><span style="color: hsl(0, 100%, 40%);">-                  handle_tbf_reject(bts_data(), ms, tlli,</span><br><span style="color: hsl(120, 100%, 40%);">+                       handle_tbf_reject(bts(), ms, tlli,</span><br><span>                           trx_no(), ts_no);</span><br><span>                    goto return_unref;</span><br><span>           }</span><br><span>@@ -984,11 +984,6 @@</span><br><span>     return trx->trx_no;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-inline gprs_rlcmac_bts *gprs_rlcmac_pdch::bts_data() const</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-      return trx->bts;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* PTCCH (Packet Timing Advance Control Channel) */</span><br><span> void gprs_rlcmac_pdch::init_ptcch_msg(void)</span><br><span> {</span><br><span>diff --git a/src/pdch.h b/src/pdch.h</span><br><span>index 7a544fe..2413ef7 100644</span><br><span>--- a/src/pdch.h</span><br><span>+++ b/src/pdch.h</span><br><span>@@ -69,7 +69,6 @@</span><br><span>     int rcv_data_block(uint8_t *data, uint8_t data_len, uint32_t fn,</span><br><span>             struct pcu_l1_meas *meas, enum CodingScheme cs);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    gprs_rlcmac_bts *bts_data() const;</span><br><span>   struct gprs_rlcmac_bts *bts() const;</span><br><span>         uint8_t trx_no() const;</span><br><span> </span><br><span>diff --git a/src/tbf.cpp b/src/tbf.cpp</span><br><span>index 05f4e2c..3464242 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -168,11 +168,6 @@</span><br><span>  m_name_buf[0] = '\0';</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-gprs_rlcmac_bts *gprs_rlcmac_tbf::bts_data() const</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-       return bts;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> uint32_t gprs_rlcmac_tbf::tlli() const</span><br><span> {</span><br><span>  return m_ms ? ms_tlli(m_ms) : GSM_RESERVED_TMSI;</span><br><span>@@ -318,7 +313,7 @@</span><br><span>       talloc_free(tbf);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-uint16_t egprs_window_size(const struct gprs_rlcmac_bts *bts_data, uint8_t slots)</span><br><span style="color: hsl(120, 100%, 40%);">+uint16_t egprs_window_size(const struct gprs_rlcmac_bts *bts, uint8_t slots)</span><br><span> {</span><br><span>       uint8_t num_pdch = pcu_bitcount(slots);</span><br><span> </span><br><span>@@ -328,7 +323,6 @@</span><br><span> </span><br><span> int gprs_rlcmac_tbf::update()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-     struct gprs_rlcmac_bts *bts_data = bts;</span><br><span>      int rc;</span><br><span> </span><br><span>  if (direction != GPRS_RLCMAC_DL_TBF)</span><br><span>@@ -337,7 +331,7 @@</span><br><span>   LOGP(DTBF, LOGL_DEBUG, "********** DL-TBF update **********\n");</span><br><span> </span><br><span>       tbf_unlink_pdch(this);</span><br><span style="color: hsl(0, 100%, 40%);">-  rc = the_pcu->alloc_algorithm(bts_data, ms(), this, false, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+    rc = the_pcu->alloc_algorithm(bts, ms(), this, false, -1);</span><br><span>        /* if no resource */</span><br><span>         if (rc < 0) {</span><br><span>             LOGPTBF(this, LOGL_ERROR, "No resource after update???\n");</span><br><span>@@ -738,7 +732,6 @@</span><br><span> </span><br><span> int gprs_rlcmac_tbf::setup(int8_t use_trx, bool single_slot)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-    struct gprs_rlcmac_bts *bts_data = bts;</span><br><span>      int rc;</span><br><span> </span><br><span>  if (ms_mode(m_ms) != GPRS)</span><br><span>@@ -746,7 +739,7 @@</span><br><span> </span><br><span>         m_created_ts = time(NULL);</span><br><span>   /* select algorithm */</span><br><span style="color: hsl(0, 100%, 40%);">-  rc = the_pcu->alloc_algorithm(bts_data, m_ms, this, single_slot, use_trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = the_pcu->alloc_algorithm(bts, m_ms, this, single_slot, use_trx);</span><br><span>     /* if no resource */</span><br><span>         if (rc < 0) {</span><br><span>             return -1;</span><br><span>diff --git a/src/tbf.h b/src/tbf.h</span><br><span>index cb4c9b9..73266bf 100644</span><br><span>--- a/src/tbf.h</span><br><span>+++ b/src/tbf.h</span><br><span>@@ -348,7 +348,6 @@</span><br><span>    struct llist_item m_bts_list;</span><br><span> </span><br><span> protected:</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_rlcmac_bts *bts_data() const;</span><br><span>   void merge_and_clear_ms(GprsMs *old_ms);</span><br><span> </span><br><span>         gprs_llc_queue *llc_queue();</span><br><span>@@ -567,6 +566,6 @@</span><br><span>           ((int)GPRS_RLCMAC_UL_TBF - (int)dir + (int)GPRS_RLCMAC_DL_TBF);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-uint16_t egprs_window_size(const struct gprs_rlcmac_bts *bts_data, uint8_t slots);</span><br><span style="color: hsl(120, 100%, 40%);">+uint16_t egprs_window_size(const struct gprs_rlcmac_bts *bts, uint8_t slots);</span><br><span> </span><br><span> #endif</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22276">change 22276</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-pcu/+/22276"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I9852bf439292d1abc70711bea65698b21bde0ee8 </div>
<div style="display:none"> Gerrit-Change-Number: 22276 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>