summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-06-28 00:15:31 +0200
committerPhilipp Maier <pmaier@sysmocom.de>2017-07-05 16:02:05 +0200
commit4fca7f82dca3e78a6da732901544f9ec8aaac90b (patch)
treee11e22acc38bf275b410b9615140836c54514000
parent094024259f92cc19ca5364662ce7f8129c2efbac (diff)
fixup: remove allocation/usage of iu struct again.
The allocation and usage of the iu struct was accidentally re-introduced into a_iface_bssap.c. Remove the allocation and the usage of iu struct. Related to: aoip: don't use iu struct: do not allocate unnecessary ue_conn_ctx
-rw-r--r--openbsc/src/libmsc/a_iface_bssap.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/openbsc/src/libmsc/a_iface_bssap.c b/openbsc/src/libmsc/a_iface_bssap.c
index 0931544dc..d01210ed1 100644
--- a/openbsc/src/libmsc/a_iface_bssap.c
+++ b/openbsc/src/libmsc/a_iface_bssap.c
@@ -41,22 +41,20 @@
*/
/* Allocate a new subscriber connection */
-static struct gsm_subscriber_connection *subscr_conn_allocate_a(const struct a_conn_info *a_conn_info,
- struct gsm_network *network, struct ue_conn_ctx *ue,
+static struct gsm_subscriber_connection *subscr_conn_allocate_a(struct a_conn_info *a_conn_info,
+ struct gsm_network *network,
uint16_t lac, struct osmo_sccp_user *scu, int conn_id)
{
struct gsm_subscriber_connection *conn;
- LOGP(DMSC, LOGL_NOTICE, "Allocating A-Interface subscriber conn: lac %i, conn_id %i\n", lac, ue->conn_id);
+ LOGP(DMSC, LOGL_NOTICE, "Allocating A-Interface subscriber conn: lac %i, conn_id %i\n", lac, conn_id);
- conn = talloc_zero(ue, struct gsm_subscriber_connection);
+ conn = talloc_zero(network, struct gsm_subscriber_connection);
if (!conn)
return NULL;
conn->network = network;
conn->via_ran = RAN_GERAN_A;
- conn->iu.ue_ctx = ue;
- conn->iu.ue_ctx->rab_assign_addr_enc = network->iu.rab_assign_addr_enc;
conn->lac = lac;
conn->a.conn_id = conn_id;
@@ -271,7 +269,6 @@ static int bssmap_rx_l3_compl(struct osmo_sccp_user *scu, const struct a_conn_in
int rc;
struct gsm_network *network = a_conn_info->network;
- struct ue_conn_ctx *ue;
struct gsm_subscriber_connection *conn;
LOGP(DMSC, LOGL_NOTICE, "BSC has completed layer 3 connection (conn_id=%i)\n", a_conn_info->conn_id);
@@ -315,8 +312,7 @@ static int bssmap_rx_l3_compl(struct osmo_sccp_user *scu, const struct a_conn_in
msg->tail = msg->l3h + TLVP_LEN(&tp, GSM0808_IE_LAYER_3_INFORMATION);
/* Create new subscriber context */
- ue = ue_conn_ctx_alloc(a_conn_info->bsc_addr, a_conn_info->conn_id);
- conn = subscr_conn_allocate_a(a_conn_info, network, ue, lac, scu, a_conn_info->conn_id);
+ conn = subscr_conn_allocate_a(a_conn_info, network, lac, scu, a_conn_info->conn_id);
/* Handover location update to the MSC code */
/* msc_compl_l3() takes ownership of dtap_msg