<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25796">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move lchan_deactivate() to lchan.c<br><br>Change-Id: If75ed432fa9dcb10159a0dac9b8ba7efe6958b35<br>---<br>M include/osmo-bts/lchan.h<br>M include/osmo-bts/rsl.h<br>M src/common/lchan.c<br>M src/common/rsl.c<br>4 files changed, 10 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/96/25796/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h</span><br><span>index 665bb44..ccc6760 100644</span><br><span>--- a/include/osmo-bts/lchan.h</span><br><span>+++ b/include/osmo-bts/lchan.h</span><br><span>@@ -331,6 +331,7 @@</span><br><span> void gsm_lchan_name_update(struct gsm_lchan *lchan);</span><br><span> int lchan_init_lapdm(struct gsm_lchan *lchan);</span><br><span> void gsm_lchan_release(struct gsm_lchan *lchan, enum lchan_rel_act_kind rel_kind);</span><br><span style="color: hsl(120, 100%, 40%);">+int lchan_deactivate(struct gsm_lchan *lchan);</span><br><span> const char *gsm_lchans_name(enum gsm_lchan_state s);</span><br><span> </span><br><span> static inline char *gsm_lchan_name(const struct gsm_lchan *lchan)</span><br><span>diff --git a/include/osmo-bts/rsl.h b/include/osmo-bts/rsl.h</span><br><span>index 1663006..9d5ec31 100644</span><br><span>--- a/include/osmo-bts/rsl.h</span><br><span>+++ b/include/osmo-bts/rsl.h</span><br><span>@@ -17,8 +17,6 @@</span><br><span> int rsl_tx_rf_rel_ack(struct gsm_lchan *lchan);</span><br><span> int rsl_tx_hando_det(struct gsm_lchan *lchan, uint8_t *ho_delay);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int lchan_deactivate(struct gsm_lchan *lchan);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* call-back for LAPDm code, called when it wants to send msgs UP */</span><br><span> int lapdm_rll_tx_cb(struct msgb *msg, struct lapdm_entity *le, void *ctx);</span><br><span> </span><br><span>diff --git a/src/common/lchan.c b/src/common/lchan.c</span><br><span>index e06ea5c..5d12952 100644</span><br><span>--- a/src/common/lchan.c</span><br><span>+++ b/src/common/lchan.c</span><br><span>@@ -30,6 +30,7 @@</span><br><span> #include <osmo-bts/pcu_if.h></span><br><span> #include <osmo-bts/handover.h></span><br><span> #include <osmo-bts/l1sap.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/bts_model.h></span><br><span> #include <errno.h></span><br><span> </span><br><span> static const struct value_string lchan_s_names[] = {</span><br><span>@@ -234,6 +235,14 @@</span><br><span>     lapdm_channel_exit(&lchan->lapdm_ch);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int lchan_deactivate(struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+       OSMO_ASSERT(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ciph_state = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+     return bts_model_lchan_deactivate(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> const char *gsm_lchans_name(enum gsm_lchan_state s)</span><br><span> {</span><br><span>   return get_value_string(lchan_s_names, s);</span><br><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index b186adf..99e8195 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -3832,14 +3832,6 @@</span><br><span>     return ret;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int lchan_deactivate(struct gsm_lchan *lchan)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-      OSMO_ASSERT(lchan);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-     lchan->ciph_state = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-       return bts_model_lchan_deactivate(lchan);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> int down_rsl(struct gsm_bts_trx *trx, struct msgb *msg)</span><br><span> {</span><br><span>   struct abis_rsl_common_hdr *rslh;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25796">change 25796</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/25796"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If75ed432fa9dcb10159a0dac9b8ba7efe6958b35 </div>
<div style="display:none"> Gerrit-Change-Number: 25796 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>