<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9781">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Neels Hofmeyr: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rsl: use 3GPP assigned payload type constants from libosmo-netif<br><br>The payload constants for AMR, EFR, GSM-FR, and GSM-HR are already<br>defined in libosmo-netif, there is no need to re-define them locally.<br><br>- include rtp.h from libosmo-netif in abis_rsl.c<br>- remove duplicate payload type constants<br><br>Change-Id: Ib6a866b29d863d6875c67748dbe6b6468941ab29<br>Related: OS#2728<br>---<br>M src/osmo-bsc/abis_rsl.c<br>1 file changed, 1 insertion(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index bcc56bc..d5e69ac 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -46,15 +46,11 @@</span><br><span> #include <osmocom/bsc/pcu_if.h></span><br><span> #include <osmocom/bsc/bsc_api.h></span><br><span> #include <osmocom/bsc/bsc_subscr_conn_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/netif/rtp.h></span><br><span> </span><br><span> #define RSL_ALLOC_SIZE             1024</span><br><span> #define RSL_ALLOC_HEADROOM      128</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define RTP_PT_GSM_FULL 3</span><br><span style="color: hsl(0, 100%, 40%);">-#define RTP_PT_GSM_HALF 96</span><br><span style="color: hsl(0, 100%, 40%);">-#define RTP_PT_GSM_EFR 97</span><br><span style="color: hsl(0, 100%, 40%);">-#define RTP_PT_AMR 98</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> enum sacch_deact {</span><br><span>       SACCH_NONE,</span><br><span>  SACCH_DEACTIVATE,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9781">change 9781</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/9781"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib6a866b29d863d6875c67748dbe6b6468941ab29 </div>
<div style="display:none"> Gerrit-Change-Number: 9781 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>