lchan: Fix the name of the SACCH in the variable names
Call the channel by the right name.
diff --git a/openbsc/src/libbsc/bsc_api.c b/openbsc/src/libbsc/bsc_api.c
index a451e05..f0b8063 100644
--- a/openbsc/src/libbsc/bsc_api.c
+++ b/openbsc/src/libbsc/bsc_api.c
@@ -272,7 +272,7 @@
/*! \brief process incoming 08.08 DTAP from MSC (send via BTS to MS) */
int gsm0808_submit_dtap(struct gsm_subscriber_connection *conn,
- struct msgb *msg, int link_id, int allow_sach)
+ struct msgb *msg, int link_id, int allow_sacch)
{
uint8_t sapi;
@@ -289,7 +289,7 @@
msg->dst = msg->lchan->ts->trx->rsl_link;
/* If we are on a TCH and need to submit a SMS (on SAPI=3) we need to use the SACH */
- if (allow_sach && sapi != 0) {
+ if (allow_sacch && sapi != 0) {
if (conn->lchan->type == GSM_LCHAN_TCH_F || conn->lchan->type == GSM_LCHAN_TCH_H)
link_id |= 0x40;
}
diff --git a/openbsc/src/libbsc/chan_alloc.c b/openbsc/src/libbsc/chan_alloc.c
index 0fd7c4e..69b2625 100644
--- a/openbsc/src/libbsc/chan_alloc.c
+++ b/openbsc/src/libbsc/chan_alloc.c
@@ -344,7 +344,7 @@
lchan->conn = NULL;
}
- lchan->sach_deact = 0;
+ lchan->sacch_deact = 0;
lchan->release_mode = 0;
/* FIXME: ts_free() the timeslot, if we're the last logical
@@ -403,7 +403,7 @@
if (_lchan_release_next_sapi(lchan) == 0)
return;
- if (lchan->sach_deact) {
+ if (lchan->sacch_deact) {
gsm48_send_rr_release(lchan);
return;
}
@@ -424,14 +424,14 @@
}
/* Consider releasing the channel now */
-int lchan_release(struct gsm_lchan *lchan, int sach_deact, int mode)
+int lchan_release(struct gsm_lchan *lchan, int sacch_deact, int mode)
{
DEBUGP(DRLL, "%s starting release sequence\n", gsm_lchan_name(lchan));
rsl_lchan_set_state(lchan, LCHAN_S_REL_REQ);
lchan->conn = NULL;
lchan->release_mode = mode;
- lchan->sach_deact = sach_deact;
+ lchan->sacch_deact = sacch_deact;
_lchan_handle_release(lchan);
return 1;
}