<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22182">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move dl_tbf_preemptive_retransmission field from BTS to PCU<br><br>Change-Id: I3ab32fcafe83f3ecb116a5b8a05f58f3fddc5451<br>---<br>M src/bts.cpp<br>M src/bts.h<br>M src/gprs_pcu.c<br>M src/gprs_pcu.h<br>M src/pcu_vty.c<br>M src/tbf_dl.cpp<br>6 files changed, 6 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/82/22182/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bts.cpp b/src/bts.cpp</span><br><span>index 3200b40..46f0033 100644</span><br><span>--- a/src/bts.cpp</span><br><span>+++ b/src/bts.cpp</span><br><span>@@ -253,7 +253,6 @@</span><br><span> </span><br><span>  bts->app_info = NULL;</span><br><span>     bts->bts = bts_obj;</span><br><span style="color: hsl(0, 100%, 40%);">-  bts->dl_tbf_preemptive_retransmission = true;</span><br><span>     bts->T_defs_bts = T_defs_bts;</span><br><span>     osmo_tdefs_reset(bts->T_defs_bts);</span><br><span> </span><br><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index 8368855..0b882b3 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -106,7 +106,6 @@</span><br><span>     uint8_t n3105;</span><br><span>       struct gprs_rlcmac_trx trx[8];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      bool dl_tbf_preemptive_retransmission;</span><br><span>       uint8_t si13[GSM_MACBLOCK_LEN];</span><br><span>      bool si13_is_set;</span><br><span>    /* 0 to support resegmentation in DL, 1 for no reseg */</span><br><span>diff --git a/src/gprs_pcu.c b/src/gprs_pcu.c</span><br><span>index f791e43..3b44d36 100644</span><br><span>--- a/src/gprs_pcu.c</span><br><span>+++ b/src/gprs_pcu.c</span><br><span>@@ -51,6 +51,7 @@</span><br><span>     pcu->vty.max_mcs_ul = MAX_EDGE_MCS;</span><br><span>       pcu->vty.max_mcs_dl = MAX_EDGE_MCS;</span><br><span>       pcu->vty.alpha = 0; /* a = 0.0 */</span><br><span style="color: hsl(120, 100%, 40%);">+  pcu->vty.dl_tbf_preemptive_retransmission = true;</span><br><span> </span><br><span>     pcu->T_defs = T_defs_pcu;</span><br><span>         osmo_tdefs_reset(pcu->T_defs);</span><br><span>diff --git a/src/gprs_pcu.h b/src/gprs_pcu.h</span><br><span>index d6d2dca..2f2fdc7 100644</span><br><span>--- a/src/gprs_pcu.h</span><br><span>+++ b/src/gprs_pcu.h</span><br><span>@@ -76,6 +76,7 @@</span><br><span>           uint8_t max_mcs_dl, max_mcs_ul;</span><br><span>              uint8_t force_two_phase;</span><br><span>             uint8_t alpha, gamma;</span><br><span style="color: hsl(120, 100%, 40%);">+         bool dl_tbf_preemptive_retransmission;</span><br><span>       } vty;</span><br><span> </span><br><span>   struct gsmtap_inst *gsmtap;</span><br><span>diff --git a/src/pcu_vty.c b/src/pcu_vty.c</span><br><span>index 06e1674..727712d 100644</span><br><span>--- a/src/pcu_vty.c</span><br><span>+++ b/src/pcu_vty.c</span><br><span>@@ -231,7 +231,7 @@</span><br><span>           vty_out(vty, " two-phase-access%s", VTY_NEWLINE);</span><br><span>  vty_out(vty, " alpha %d%s", the_pcu->vty.alpha, VTY_NEWLINE);</span><br><span>   vty_out(vty, " gamma %d%s", the_pcu->vty.gamma * 2, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">-  if (!bts->dl_tbf_preemptive_retransmission)</span><br><span style="color: hsl(120, 100%, 40%);">+        if (!the_pcu->vty.dl_tbf_preemptive_retransmission)</span><br><span>               vty_out(vty, " no dl-tbf-preemptive-retransmission%s", VTY_NEWLINE);</span><br><span>       if (strcmp(the_pcu->pcu_sock_path, PCU_SOCK_DEFAULT))</span><br><span>             vty_out(vty, " pcu-socket %s%s", the_pcu->pcu_sock_path, VTY_NEWLINE);</span><br><span>@@ -869,10 +869,7 @@</span><br><span>      RETRANSMISSION_STR " (enabled by default)",</span><br><span>        CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-     struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  bts->dl_tbf_preemptive_retransmission = true;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+      the_pcu->vty.dl_tbf_preemptive_retransmission = true;</span><br><span>     return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -882,10 +879,7 @@</span><br><span>     NO_STR RETRANSMISSION_STR,</span><br><span>           CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-     struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  bts->dl_tbf_preemptive_retransmission = false;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+     the_pcu->vty.dl_tbf_preemptive_retransmission = false;</span><br><span>    return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp</span><br><span>index 280e057..6f57e7d 100644</span><br><span>--- a/src/tbf_dl.cpp</span><br><span>+++ b/src/tbf_dl.cpp</span><br><span>@@ -545,7 +545,7 @@</span><br><span>                        force_cs ? " (forced)" : "");</span><br><span> </span><br><span>              bsn = create_new_bsn(fn, new_cs);</span><br><span style="color: hsl(0, 100%, 40%);">-       } else if (bts->bts_data()->dl_tbf_preemptive_retransmission && !m_window.window_empty()) {</span><br><span style="color: hsl(120, 100%, 40%);">+     } else if (bts->pcu->vty.dl_tbf_preemptive_retransmission && !m_window.window_empty()) {</span><br><span>               /* The window contains unacked packages, but not acked.</span><br><span>               * Mark unacked bsns as RESEND */</span><br><span>            LOGPTBFDL(this, LOGL_DEBUG,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22182">change 22182</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/+/22182"/><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: I3ab32fcafe83f3ecb116a5b8a05f58f3fddc5451 </div>
<div style="display:none"> Gerrit-Change-Number: 22182 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>