osmo-bts[master]: Remove unused variables
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/6248 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3fec7e4b337f3ea4d8cd79f4e7261babc34911cb Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-HasComments: No
[MERGED] osmo-bts[master]: Remove unused variables
Harald Welte has submitted this change and it was merged. Change subject: Remove unused variables .. Remove unused variables Change-Id: I3fec7e4b337f3ea4d8cd79f4e7261babc34911cb --- M src/common/l1sap.c M src/osmo-bts-trx/l1_if.c 2 files changed, 0 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 30c2759..a36ad88 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -448,7 +448,6 @@ struct osmo_phsap_prim *l1sap, struct info_time_ind_param *info_time_ind) { - struct gsm_bts_trx *trx; struct gsm_bts_role_bts *btsb = bts->role; int frames_expired; diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 3c11dfd..8f24ccf 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -135,7 +135,6 @@ */ int l1if_provision_transceiver_trx(struct trx_l1h *l1h) { - struct phy_link *plink = l1h->phy_inst->phy_link; uint8_t tn; if (!transceiver_available) @@ -215,7 +214,6 @@ llist_for_each_entry(trx, &bts->trx_list, list) { struct phy_instance *pinst = trx_phy_instance(trx); - struct phy_link *plink = pinst->phy_link; struct trx_l1h *l1h = pinst->u.osmotrx.hdl; l1h->config.arfcn_sent = 0; l1h->config.tsc_sent = 0; @@ -305,7 +303,6 @@ { struct gsm_bts_trx *trx; uint8_t bsic = bts->bsic; - struct gsm_bts_role_bts *btsb = bts_role_bts(bts); llist_for_each_entry(trx, &bts->trx_list, list) { struct phy_instance *pinst = trx_phy_instance(trx); @@ -327,7 +324,6 @@ static uint8_t trx_set_trx(struct gsm_bts_trx *trx) { struct phy_instance *pinst = trx_phy_instance(trx); - struct phy_link *plink = pinst->phy_link; struct trx_l1h *l1h = pinst->u.osmotrx.hdl; uint16_t arfcn = trx->arfcn; -- To view, visit https://gerrit.osmocom.org/6248 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3fec7e4b337f3ea4d8cd79f4e7261babc34911cb Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter
[PATCH] osmo-bts[master]: Remove unused variables
Hello Vadim Yanitskiy, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/6248 to look at the new patch set (#2). Remove unused variables Change-Id: I3fec7e4b337f3ea4d8cd79f4e7261babc34911cb --- M src/common/l1sap.c M src/osmo-bts-trx/l1_if.c 2 files changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/6248/2 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 30c2759..a36ad88 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -448,7 +448,6 @@ struct osmo_phsap_prim *l1sap, struct info_time_ind_param *info_time_ind) { - struct gsm_bts_trx *trx; struct gsm_bts_role_bts *btsb = bts->role; int frames_expired; diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 3c11dfd..8f24ccf 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -135,7 +135,6 @@ */ int l1if_provision_transceiver_trx(struct trx_l1h *l1h) { - struct phy_link *plink = l1h->phy_inst->phy_link; uint8_t tn; if (!transceiver_available) @@ -215,7 +214,6 @@ llist_for_each_entry(trx, &bts->trx_list, list) { struct phy_instance *pinst = trx_phy_instance(trx); - struct phy_link *plink = pinst->phy_link; struct trx_l1h *l1h = pinst->u.osmotrx.hdl; l1h->config.arfcn_sent = 0; l1h->config.tsc_sent = 0; @@ -305,7 +303,6 @@ { struct gsm_bts_trx *trx; uint8_t bsic = bts->bsic; - struct gsm_bts_role_bts *btsb = bts_role_bts(bts); llist_for_each_entry(trx, &bts->trx_list, list) { struct phy_instance *pinst = trx_phy_instance(trx); @@ -327,7 +324,6 @@ static uint8_t trx_set_trx(struct gsm_bts_trx *trx) { struct phy_instance *pinst = trx_phy_instance(trx); - struct phy_link *plink = pinst->phy_link; struct trx_l1h *l1h = pinst->u.osmotrx.hdl; uint16_t arfcn = trx->arfcn; -- To view, visit https://gerrit.osmocom.org/6248 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3fec7e4b337f3ea4d8cd79f4e7261babc34911cb Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter
osmo-bts[master]: Remove unused variables
Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/6248/1/src/common/rsl.c File src/common/rsl.c: Line 1251 > The Patch looks ok to me, but this line must stay. Its a fix for a nullpoin Hey thanks for pointing it out, I think this change ended inside the patch while playing with git revert -n to remove some whitespace or doing some tests. -- To view, visit https://gerrit.osmocom.org/6248 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3fec7e4b337f3ea4d8cd79f4e7261babc34911cb Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-HasComments: Yes
osmo-bts[master]: Remove unused variables
Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/6248 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3fec7e4b337f3ea4d8cd79f4e7261babc34911cb Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-HasComments: No
osmo-bts[master]: Remove unused variables
Patch Set 1: (1 comment) > (1 comment) https://gerrit.osmocom.org/#/c/6248/1/src/common/rsl.c File src/common/rsl.c: Line 1251 > This one was introduced recently by @dexter. The Patch looks ok to me, but this line must stay. Its a fix for a nullpointer deref. See also function rsl_tx_mode_modif_ack() below, there this is set as well. -- To view, visit https://gerrit.osmocom.org/6248 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3fec7e4b337f3ea4d8cd79f4e7261babc34911cb Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-HasComments: Yes
osmo-bts[master]: Remove unused variables
Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/6248/1/src/common/rsl.c File src/common/rsl.c: Line 1251 This one was introduced recently by @dexter. Please see: https://gerrit.osmocom.org/#/c/6096/ Why is this considered as unused? -- To view, visit https://gerrit.osmocom.org/6248 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3fec7e4b337f3ea4d8cd79f4e7261babc34911cb Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: Yes
[PATCH] osmo-bts[master]: Remove unused variables
Review at https://gerrit.osmocom.org/6248 Remove unused variables Change-Id: I3fec7e4b337f3ea4d8cd79f4e7261babc34911cb --- M src/common/l1sap.c M src/common/rsl.c M src/osmo-bts-trx/l1_if.c 3 files changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/6248/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 30c2759..a36ad88 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -448,7 +448,6 @@ struct osmo_phsap_prim *l1sap, struct info_time_ind_param *info_time_ind) { - struct gsm_bts_trx *trx; struct gsm_bts_role_bts *btsb = bts->role; int frames_expired; diff --git a/src/common/rsl.c b/src/common/rsl.c index 3d0993c..1f45cc6 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1248,7 +1248,6 @@ msgb_tlv_put(msg, RSL_IE_CAUSE, 1, &cause); rsl_dch_push_hdr(msg, RSL_MT_MODE_MODIFY_NACK, chan_nr); msg->lchan = lchan; - msg->trx = lchan->ts->trx; return abis_bts_rsl_sendmsg(msg); } diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 3c11dfd..8f24ccf 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -135,7 +135,6 @@ */ int l1if_provision_transceiver_trx(struct trx_l1h *l1h) { - struct phy_link *plink = l1h->phy_inst->phy_link; uint8_t tn; if (!transceiver_available) @@ -215,7 +214,6 @@ llist_for_each_entry(trx, &bts->trx_list, list) { struct phy_instance *pinst = trx_phy_instance(trx); - struct phy_link *plink = pinst->phy_link; struct trx_l1h *l1h = pinst->u.osmotrx.hdl; l1h->config.arfcn_sent = 0; l1h->config.tsc_sent = 0; @@ -305,7 +303,6 @@ { struct gsm_bts_trx *trx; uint8_t bsic = bts->bsic; - struct gsm_bts_role_bts *btsb = bts_role_bts(bts); llist_for_each_entry(trx, &bts->trx_list, list) { struct phy_instance *pinst = trx_phy_instance(trx); @@ -327,7 +324,6 @@ static uint8_t trx_set_trx(struct gsm_bts_trx *trx) { struct phy_instance *pinst = trx_phy_instance(trx); - struct phy_link *plink = pinst->phy_link; struct trx_l1h *l1h = pinst->u.osmotrx.hdl; uint16_t arfcn = trx->arfcn; -- To view, visit https://gerrit.osmocom.org/6248 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3fec7e4b337f3ea4d8cd79f4e7261babc34911cb Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol