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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libvlr: vlr_set_ciph_mode(): avoid redundant check<br><br>This function is never called when ciph_required is false, so<br>there is no need for an additional check in this function.<br><br>Change-Id: I900ddd5f1882f8cee234ab1074adcf25830a092c<br>---<br>M include/osmocom/msc/vlr.h<br>M src/libvlr/vlr.c<br>M src/libvlr/vlr_access_req_fsm.c<br>M src/libvlr/vlr_lu_fsm.c<br>4 files changed, 0 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h</span><br><span>index f12e906..d752dfb 100644</span><br><span>--- a/include/osmocom/msc/vlr.h</span><br><span>+++ b/include/osmocom/msc/vlr.h</span><br><span>@@ -472,7 +472,6 @@</span><br><span> int vlr_set_ciph_mode(struct vlr_instance *vlr,</span><br><span>                   struct osmo_fsm_inst *fi,</span><br><span>                    void *msc_conn_ref,</span><br><span style="color: hsl(0, 100%, 40%);">-                     bool ciph_required,</span><br><span>                  bool umts_aka,</span><br><span>                       bool retrieve_imeisv);</span><br><span> </span><br><span>diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c</span><br><span>index 23bd671..fc23b37 100644</span><br><span>--- a/src/libvlr/vlr.c</span><br><span>+++ b/src/libvlr/vlr.c</span><br><span>@@ -1382,13 +1382,9 @@</span><br><span> int vlr_set_ciph_mode(struct vlr_instance *vlr,</span><br><span>                  struct osmo_fsm_inst *fi,</span><br><span>                    void *msc_conn_ref,</span><br><span style="color: hsl(0, 100%, 40%);">-                     bool ciph_required,</span><br><span>                  bool umts_aka,</span><br><span>                       bool retrieve_imeisv)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        if (!ciph_required)</span><br><span style="color: hsl(0, 100%, 40%);">-             return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>    LOGPFSML(fi, LOGL_DEBUG, "Set Ciphering Mode\n");</span><br><span>  return vlr->ops.set_ciph_mode(msc_conn_ref, umts_aka, retrieve_imeisv);</span><br><span> }</span><br><span>diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c</span><br><span>index b3660ff..b880fcf 100644</span><br><span>--- a/src/libvlr/vlr_access_req_fsm.c</span><br><span>+++ b/src/libvlr/vlr_access_req_fsm.c</span><br><span>@@ -299,7 +299,6 @@</span><br><span>       }</span><br><span> </span><br><span>        if (vlr_set_ciph_mode(vsub->vlr, fi, par->msc_conn_ref,</span><br><span style="color: hsl(0, 100%, 40%);">-                         par->ciphering_required,</span><br><span>                          umts_aka,</span><br><span>                            vsub->vlr->cfg.retrieve_imeisv_ciphered)) {</span><br><span>              LOGPFSML(fi, LOGL_ERROR,</span><br><span>diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c</span><br><span>index 53e614d..41e5608 100644</span><br><span>--- a/src/libvlr/vlr_lu_fsm.c</span><br><span>+++ b/src/libvlr/vlr_lu_fsm.c</span><br><span>@@ -878,7 +878,6 @@</span><br><span>      }</span><br><span> </span><br><span>        if (vlr_set_ciph_mode(vsub->vlr, fi, lfp->msc_conn_ref,</span><br><span style="color: hsl(0, 100%, 40%);">-                         lfp->ciphering_required,</span><br><span>                          umts_aka,</span><br><span>                            vsub->vlr->cfg.retrieve_imeisv_ciphered)) {</span><br><span>              LOGPFSML(fi, LOGL_ERROR,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/26405">change 26405</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-msc/+/26405"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I900ddd5f1882f8cee234ab1074adcf25830a092c </div>
<div style="display:none"> Gerrit-Change-Number: 26405 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>