Change in osmo-bts[master]: Move lchan_deactivate() to lchan.c

[pespin]

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25796 )


Change subject: Move lchan_deactivate() to lchan.c
......................................................................

Move lchan_deactivate() to lchan.c

Change-Id: If75ed432fa9dcb10159a0dac9b8ba7efe6958b35
---
M include/osmo-bts/lchan.h
M include/osmo-bts/rsl.h
M src/common/lchan.c
M src/common/rsl.c
4 files changed, 10 insertions(+), 10 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/96/25796/1

diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h
index 665bb44..ccc6760 100644
--- a/include/osmo-bts/lchan.h
+++ b/include/osmo-bts/lchan.h
@@ -331,6 +331,7 @@
 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 1663006..9d5ec31 100644
--- a/include/osmo-bts/rsl.h
+++ b/include/osmo-bts/rsl.h
@@ -17,8 +17,6 @@
 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 e06ea5c..5d12952 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 @@
 	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 b186adf..99e8195 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -3832,14 +3832,6 @@
 	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;

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25796
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: If75ed432fa9dcb10159a0dac9b8ba7efe6958b35
Gerrit-Change-Number: 25796
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211014/84c3e555/attachment.htm>