Change in osmo-bsc[master]: drop dead code: conn->T10, handled by gscon instead

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9503 )

Change subject: drop dead code: conn->T10, handled by gscon instead
......................................................................

drop dead code: conn->T10, handled by gscon instead

Change-Id: Ief20cb0f46dd93f46dd765dca307724dc2b3487c
---
M include/osmocom/bsc/gsm_data.h
M src/osmo-bsc/bsc_api.c
2 files changed, 0 insertions(+), 10 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 281f2d4..8f245c9 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -112,8 +112,6 @@
 	/* handover information, if a handover is pending for this conn. */
 	struct bsc_handover *ho;
 
-	/* timer for assignment handling */
-	struct osmo_timer_list T10;
 	/* the future allocated but not yet used lchan during ASSIGNMENT */
 	struct gsm_lchan *secondary_lchan;
 
diff --git a/src/osmo-bsc/bsc_api.c b/src/osmo-bsc/bsc_api.c
index 218f1a1..4cf11a4 100644
--- a/src/osmo-bsc/bsc_api.c
+++ b/src/osmo-bsc/bsc_api.c
@@ -327,9 +327,6 @@
 		return;
 	}
 
-	/* swap channels */
-	osmo_timer_del(&conn->T10);
-
 	lchan_release(conn->lchan, 0, RSL_REL_LOCAL_END);
 	conn->lchan = conn->secondary_lchan;
 	conn->secondary_lchan = NULL;
@@ -374,7 +371,6 @@
 	}
 
 	/* stop the timer and release it */
-	osmo_timer_del(&conn->T10);
 	if (conn->secondary_lchan) {
 		lchan_release(conn->secondary_lchan, 0, RSL_REL_LOCAL_END);
 		conn->secondary_lchan = NULL;
@@ -533,7 +529,6 @@
 			handle_ass_fail(conn, msg);
 			break;
 		case GSM48_MT_RR_CHAN_MODE_MODIF_ACK:
-			osmo_timer_del(&conn->T10);
 			rc = gsm48_rx_rr_modif_ack(msg);
 			if (rc < 0)
 				bsc_assign_fail(conn, GSM0808_CAUSE_NO_RADIO_RESOURCE_AVAILABLE, NULL);
@@ -645,8 +640,6 @@
 	conn->lchan = NULL;
 	conn->secondary_lchan = NULL;
 
-	osmo_timer_del(&conn->T10);
-
 	return 0;
 }
 
@@ -712,7 +705,6 @@
 	if (conn->secondary_lchan == lchan) {
 		LOGPLCHAN(lchan, DMSC, LOGL_NOTICE,
 			  "lchan release on new lchan, Assignment failed\n");
-		osmo_timer_del(&conn->T10);
 		conn->secondary_lchan = NULL;
 
 		bsc_assign_fail(conn, GSM0808_CAUSE_RADIO_INTERFACE_FAILURE, NULL);

-- 
To view, visit https://gerrit.osmocom.org/9503
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ief20cb0f46dd93f46dd765dca307724dc2b3487c
Gerrit-Change-Number: 9503
Gerrit-PatchSet: 3
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180608/c93b28e2/attachment.htm>