aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/osmo-bts/lchan.h1
-rw-r--r--include/osmo-bts/rsl.h2
-rw-r--r--src/common/lchan.c9
-rw-r--r--src/common/rsl.c8
4 files changed, 10 insertions, 10 deletions
diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h
index 665bb441..ccc67600 100644
--- a/include/osmo-bts/lchan.h
+++ b/include/osmo-bts/lchan.h
@@ -331,6 +331,7 @@ void gsm_lchan_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned
void gsm_lchan_name_update(struct gsm_lchan *lchan);
int lchan_init_lapdm(struct gsm_lchan *lchan);
void gsm_lchan_release(struct gsm_lchan *lchan, enum lchan_rel_act_kind rel_kind);
+int lchan_deactivate(struct gsm_lchan *lchan);
const char *gsm_lchans_name(enum gsm_lchan_state s);
static inline char *gsm_lchan_name(const struct gsm_lchan *lchan)
diff --git a/include/osmo-bts/rsl.h b/include/osmo-bts/rsl.h
index 16630067..9d5ec315 100644
--- a/include/osmo-bts/rsl.h
+++ b/include/osmo-bts/rsl.h
@@ -17,8 +17,6 @@ int rsl_tx_conn_fail(const struct gsm_lchan *lchan, uint8_t cause);
int rsl_tx_rf_rel_ack(struct gsm_lchan *lchan);
int rsl_tx_hando_det(struct gsm_lchan *lchan, uint8_t *ho_delay);
-int lchan_deactivate(struct gsm_lchan *lchan);
-
/* call-back for LAPDm code, called when it wants to send msgs UP */
int lapdm_rll_tx_cb(struct msgb *msg, struct lapdm_entity *le, void *ctx);
diff --git a/src/common/lchan.c b/src/common/lchan.c
index e06ea5ce..5d129526 100644
--- a/src/common/lchan.c
+++ b/src/common/lchan.c
@@ -30,6 +30,7 @@
#include <osmo-bts/pcu_if.h>
#include <osmo-bts/handover.h>
#include <osmo-bts/l1sap.h>
+#include <osmo-bts/bts_model.h>
#include <errno.h>
static const struct value_string lchan_s_names[] = {
@@ -234,6 +235,14 @@ void gsm_lchan_release(struct gsm_lchan *lchan, enum lchan_rel_act_kind rel_kind
lapdm_channel_exit(&lchan->lapdm_ch);
}
+int lchan_deactivate(struct gsm_lchan *lchan)
+{
+ OSMO_ASSERT(lchan);
+
+ lchan->ciph_state = 0;
+ return bts_model_lchan_deactivate(lchan);
+}
+
const char *gsm_lchans_name(enum gsm_lchan_state s)
{
return get_value_string(lchan_s_names, s);
diff --git a/src/common/rsl.c b/src/common/rsl.c
index b186adfe..99e81952 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -3832,14 +3832,6 @@ static int rsl_rx_ipaccess(struct gsm_bts_trx *trx, struct msgb *msg)
return ret;
}
-int lchan_deactivate(struct gsm_lchan *lchan)
-{
- OSMO_ASSERT(lchan);
-
- lchan->ciph_state = 0;
- return bts_model_lchan_deactivate(lchan);
-}
-
int down_rsl(struct gsm_bts_trx *trx, struct msgb *msg)
{
struct abis_rsl_common_hdr *rslh;