This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22182 ) Change subject: Move dl_tbf_preemptive_retransmission field from BTS to PCU ...................................................................... Move dl_tbf_preemptive_retransmission field from BTS to PCU Change-Id: I3ab32fcafe83f3ecb116a5b8a05f58f3fddc5451 --- M src/bts.cpp M src/bts.h M src/gprs_pcu.c M src/gprs_pcu.h M src/pcu_vty.c M src/tbf_dl.cpp 6 files changed, 6 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/bts.cpp b/src/bts.cpp index 3200b40..46f0033 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -253,7 +253,6 @@ bts->app_info = NULL; bts->bts = bts_obj; - bts->dl_tbf_preemptive_retransmission = true; bts->T_defs_bts = T_defs_bts; osmo_tdefs_reset(bts->T_defs_bts); diff --git a/src/bts.h b/src/bts.h index 81f7327..1394bfe 100644 --- a/src/bts.h +++ b/src/bts.h @@ -106,7 +106,6 @@ uint8_t n3105; struct gprs_rlcmac_trx trx[8]; - bool dl_tbf_preemptive_retransmission; uint8_t si13[GSM_MACBLOCK_LEN]; bool si13_is_set; /* 0 to support resegmentation in DL, 1 for no reseg */ diff --git a/src/gprs_pcu.c b/src/gprs_pcu.c index f791e43..3b44d36 100644 --- a/src/gprs_pcu.c +++ b/src/gprs_pcu.c @@ -51,6 +51,7 @@ pcu->vty.max_mcs_ul = MAX_EDGE_MCS; pcu->vty.max_mcs_dl = MAX_EDGE_MCS; pcu->vty.alpha = 0; /* a = 0.0 */ + pcu->vty.dl_tbf_preemptive_retransmission = true; pcu->T_defs = T_defs_pcu; osmo_tdefs_reset(pcu->T_defs); diff --git a/src/gprs_pcu.h b/src/gprs_pcu.h index d6d2dca..2f2fdc7 100644 --- a/src/gprs_pcu.h +++ b/src/gprs_pcu.h @@ -76,6 +76,7 @@ uint8_t max_mcs_dl, max_mcs_ul; uint8_t force_two_phase; uint8_t alpha, gamma; + bool dl_tbf_preemptive_retransmission; } vty; struct gsmtap_inst *gsmtap; diff --git a/src/pcu_vty.c b/src/pcu_vty.c index 06e1674..727712d 100644 --- a/src/pcu_vty.c +++ b/src/pcu_vty.c @@ -231,7 +231,7 @@ vty_out(vty, " two-phase-access%s", VTY_NEWLINE); vty_out(vty, " alpha %d%s", the_pcu->vty.alpha, VTY_NEWLINE); vty_out(vty, " gamma %d%s", the_pcu->vty.gamma * 2, VTY_NEWLINE); - if (!bts->dl_tbf_preemptive_retransmission) + if (!the_pcu->vty.dl_tbf_preemptive_retransmission) vty_out(vty, " no dl-tbf-preemptive-retransmission%s", VTY_NEWLINE); if (strcmp(the_pcu->pcu_sock_path, PCU_SOCK_DEFAULT)) vty_out(vty, " pcu-socket %s%s", the_pcu->pcu_sock_path, VTY_NEWLINE); @@ -869,10 +869,7 @@ RETRANSMISSION_STR " (enabled by default)", CMD_ATTR_IMMEDIATE) { - struct gprs_rlcmac_bts *bts = bts_main_data(); - - bts->dl_tbf_preemptive_retransmission = true; - + the_pcu->vty.dl_tbf_preemptive_retransmission = true; return CMD_SUCCESS; } @@ -882,10 +879,7 @@ NO_STR RETRANSMISSION_STR, CMD_ATTR_IMMEDIATE) { - struct gprs_rlcmac_bts *bts = bts_main_data(); - - bts->dl_tbf_preemptive_retransmission = false; - + the_pcu->vty.dl_tbf_preemptive_retransmission = false; return CMD_SUCCESS; } diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index 280e057..6f57e7d 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -545,7 +545,7 @@ force_cs ? " (forced)" : ""); bsn = create_new_bsn(fn, new_cs); - } else if (bts->bts_data()->dl_tbf_preemptive_retransmission && !m_window.window_empty()) { + } else if (bts->pcu->vty.dl_tbf_preemptive_retransmission && !m_window.window_empty()) { /* The window contains unacked packages, but not acked. * Mark unacked bsns as RESEND */ LOGPTBFDL(this, LOGL_DEBUG, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3ab32fcafe83f3ecb116a5b8a05f58f3fddc5451 Gerrit-Change-Number: 22182 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-Reviewer: pespin <pespin at sysmocom.de> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210118/3b6240dd/attachment.htm>