diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2009-12-22 07:58:24 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2009-12-22 08:02:13 +0100 |
| commit | 5c18ad08293ae6f95edd75e6bcc370fd6cff069b (patch) | |
| tree | 120273d6da84a0bdb52b32f981714e9bcaea0f59 /openbsc/src/bsc_msc_ip.c | |
| parent | 0d9ed87d5c7d5b6e21dc3bbb282e215068742566 (diff) | |
| parent | 4f5456c040c2dd0c53fe28cb51219d668d464a21 (diff) | |
Merge commit 'origin/master' into on-waves/bsc-master
Conflicts:
openbsc/include/openbsc/Makefile.am
openbsc/include/openbsc/gsm_data.h
openbsc/src/Makefile.am
openbsc/src/abis_rsl.c
openbsc/src/chan_alloc.c
openbsc/src/gsm_04_08.c
openbsc/src/gsm_data.c
openbsc/src/vty_interface.c
The biggest problem is the moving of the RTP code into
the RSL layer. This may break quite some things...
Diffstat (limited to 'openbsc/src/bsc_msc_ip.c')
| -rw-r--r-- | openbsc/src/bsc_msc_ip.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/openbsc/src/bsc_msc_ip.c b/openbsc/src/bsc_msc_ip.c index f44974838..491d56c85 100644 --- a/openbsc/src/bsc_msc_ip.c +++ b/openbsc/src/bsc_msc_ip.c @@ -467,7 +467,6 @@ static int handle_abisip_signal(unsigned int subsys, unsigned int signal, rc = rsl_ipacc_mdcx(lchan, ntohl(local_addr.s_addr), lchan->msc_data->rtp_port, - lchan->abis_ip.conn_id, rtp_payload); if (rc < 0) { DEBUGP(DMSC, "Failed to send connect: %d\n", rc); |