diff options
| -rw-r--r-- | openbsc/doc/channel_release.txt | 2 | ||||
| -rw-r--r-- | openbsc/include/openbsc/bsc_api.h | 2 | ||||
| -rw-r--r-- | openbsc/include/openbsc/chan_alloc.h | 2 | ||||
| -rw-r--r-- | openbsc/include/openbsc/gsm_data_shared.h | 2 | ||||
| -rw-r--r-- | openbsc/src/libbsc/bsc_api.c | 4 | ||||
| -rw-r--r-- | openbsc/src/libbsc/chan_alloc.c | 8 |
6 files changed, 10 insertions, 10 deletions
diff --git a/openbsc/doc/channel_release.txt b/openbsc/doc/channel_release.txt index 0f1b73c1c..e578aa828 100644 --- a/openbsc/doc/channel_release.txt +++ b/openbsc/doc/channel_release.txt @@ -55,7 +55,7 @@ bsc_api.c:gsm0808_clear * Release a channel used for handover * Release the primary lchan with normal release, SACH deactivate -chan_alloc.c:lchan_release(chan, sach_deactivate, reason) +chan_alloc.c:lchan_release(chan, sacch_deactivate, reason) * Start release procedure. It is working in steps with callbacks coming from the abis_rsl.c code. * Release all SAPI's > 0, wait for them to be released diff --git a/openbsc/include/openbsc/bsc_api.h b/openbsc/include/openbsc/bsc_api.h index 910ce9e00..472c8e471 100644 --- a/openbsc/include/openbsc/bsc_api.h +++ b/openbsc/include/openbsc/bsc_api.h @@ -37,7 +37,7 @@ struct bsc_api { }; int bsc_api_init(struct gsm_network *network, struct bsc_api *api); -int gsm0808_submit_dtap(struct gsm_subscriber_connection *conn, struct msgb *msg, int link_id, int allow_sach); +int gsm0808_submit_dtap(struct gsm_subscriber_connection *conn, struct msgb *msg, int link_id, int allow_sacch); int gsm0808_assign_req(struct gsm_subscriber_connection *conn, int chan_mode, int full_rate); int gsm0808_cipher_mode(struct gsm_subscriber_connection *conn, int cipher, const uint8_t *key, int len, int include_imeisv); diff --git a/openbsc/include/openbsc/chan_alloc.h b/openbsc/include/openbsc/chan_alloc.h index 1a7c85770..f1c890e9d 100644 --- a/openbsc/include/openbsc/chan_alloc.h +++ b/openbsc/include/openbsc/chan_alloc.h @@ -46,7 +46,7 @@ void lchan_free(struct gsm_lchan *lchan); void lchan_reset(struct gsm_lchan *lchan); /* Release the given lchan */ -int lchan_release(struct gsm_lchan *lchan, int sach_deact, int release_mode); +int lchan_release(struct gsm_lchan *lchan, int sacch_deact, int release_mode); struct load_counter { unsigned int total; diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h index acee10c0f..6fb63f9b0 100644 --- a/openbsc/include/openbsc/gsm_data_shared.h +++ b/openbsc/include/openbsc/gsm_data_shared.h @@ -177,7 +177,7 @@ struct gsm_lchan { /* Established data link layer services */ uint8_t sapis[8]; - int sach_deact; + int sacch_deact; /** GSM 08.58 9.3.20 */ int release_mode; diff --git a/openbsc/src/libbsc/bsc_api.c b/openbsc/src/libbsc/bsc_api.c index a451e0501..f0b806303 100644 --- a/openbsc/src/libbsc/bsc_api.c +++ b/openbsc/src/libbsc/bsc_api.c @@ -272,7 +272,7 @@ int bsc_api_init(struct gsm_network *network, struct bsc_api *api) /*! \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 @@ int gsm0808_submit_dtap(struct gsm_subscriber_connection *conn, 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 0fd7c4edb..69b2625c5 100644 --- a/openbsc/src/libbsc/chan_alloc.c +++ b/openbsc/src/libbsc/chan_alloc.c @@ -344,7 +344,7 @@ void lchan_free(struct gsm_lchan *lchan) 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 @@ static void _lchan_handle_release(struct gsm_lchan *lchan) 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 @@ int rsl_lchan_rll_release(struct gsm_lchan *lchan, uint8_t link_id) } /* 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; } |