diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2021-11-28 05:22:50 +0300 |
|---|---|---|
| committer | fixeria <vyanitskiy@sysmocom.de> | 2021-11-30 09:53:47 +0000 |
| commit | f4b87fa83c64fedf9f0e6bd5e69d5968d7c5edd3 (patch) | |
| tree | 6707ed8a1adec2548f5ac6f141f18826e4225ebb | |
| parent | 6d594e4e83e971703e65ddb0d00488ac39ceaf70 (diff) | |
libvlr: vlr_set_ciph_mode(): avoid redundant check
This function is never called when ciph_required is false, so
there is no need for an additional check in this function.
Change-Id: I900ddd5f1882f8cee234ab1074adcf25830a092c
| -rw-r--r-- | include/osmocom/msc/vlr.h | 1 | ||||
| -rw-r--r-- | src/libvlr/vlr.c | 4 | ||||
| -rw-r--r-- | src/libvlr/vlr_access_req_fsm.c | 1 | ||||
| -rw-r--r-- | src/libvlr/vlr_lu_fsm.c | 1 |
4 files changed, 0 insertions, 7 deletions
diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index f12e90675..d752dfb65 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -472,7 +472,6 @@ void vlr_parq_fsm_init(void); int vlr_set_ciph_mode(struct vlr_instance *vlr, struct osmo_fsm_inst *fi, void *msc_conn_ref, - bool ciph_required, bool umts_aka, bool retrieve_imeisv); diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 23bd671b9..fc23b370d 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -1382,13 +1382,9 @@ void vlr_subscr_rx_ciph_res(struct vlr_subscr *vsub, enum vlr_ciph_result_cause int vlr_set_ciph_mode(struct vlr_instance *vlr, struct osmo_fsm_inst *fi, void *msc_conn_ref, - bool ciph_required, bool umts_aka, bool retrieve_imeisv) { - if (!ciph_required) - return 0; - LOGPFSML(fi, LOGL_DEBUG, "Set Ciphering Mode\n"); return vlr->ops.set_ciph_mode(msc_conn_ref, umts_aka, retrieve_imeisv); } diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c index b3660ff8b..b880fcfe8 100644 --- a/src/libvlr/vlr_access_req_fsm.c +++ b/src/libvlr/vlr_access_req_fsm.c @@ -299,7 +299,6 @@ static void _proc_arq_vlr_node2(struct osmo_fsm_inst *fi) } if (vlr_set_ciph_mode(vsub->vlr, fi, par->msc_conn_ref, - par->ciphering_required, umts_aka, vsub->vlr->cfg.retrieve_imeisv_ciphered)) { LOGPFSML(fi, LOGL_ERROR, diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 53e614d8e..41e5608e2 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -878,7 +878,6 @@ static void vlr_loc_upd_post_auth(struct osmo_fsm_inst *fi) } if (vlr_set_ciph_mode(vsub->vlr, fi, lfp->msc_conn_ref, - lfp->ciphering_required, umts_aka, vsub->vlr->cfg.retrieve_imeisv_ciphered)) { LOGPFSML(fi, LOGL_ERROR, |