summaryrefslogtreecommitdiffstats
path: root/openbsc/src/osmo-bsc/osmo_bsc_vty.c
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-03-31 16:14:13 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-03-31 16:14:13 +0200
commitb70dfa610d89786aa72a4adb4ffc1ba27a5f8af4 (patch)
tree46b8ad0e9463c83b3a36344dc0ae050adc6ed358 /openbsc/src/osmo-bsc/osmo_bsc_vty.c
parent4b940126a3132ac6d6da4194229f2b8cb642c2ec (diff)
parentcf1302e4cb4875816615a23e5d7e2e9f7bcb5bca (diff)
Merge branch 'master' into sysmocom/iu
Conflicts: openbsc/src/libmsc/auth.c openbsc/src/libmsc/gsm_04_08.c openbsc/src/osmo-bsc/osmo_bsc_vty.c openbsc/tests/Makefile.am
Diffstat (limited to 'openbsc/src/osmo-bsc/osmo_bsc_vty.c')
-rw-r--r--openbsc/src/osmo-bsc/osmo_bsc_vty.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_vty.c b/openbsc/src/osmo-bsc/osmo_bsc_vty.c
index c8f0621dc..e623c9c10 100644
--- a/openbsc/src/osmo-bsc/osmo_bsc_vty.c
+++ b/openbsc/src/osmo-bsc/osmo_bsc_vty.c
@@ -43,7 +43,7 @@ static struct osmo_bsc_data *osmo_bsc_data(struct vty *vty)
static struct osmo_msc_data *osmo_msc_data(struct vty *vty)
{
- return osmo_msc_data_find(bsc_gsmnet, (long int) vty->index);
+ return vty->index;
}
static struct cmd_node bsc_node = {
@@ -70,7 +70,7 @@ DEFUN(cfg_net_msc, cfg_net_msc_cmd,
return CMD_WARNING;
}
- vty->index = (void *)(long int)index;
+ vty->index = msc;
vty->node = MSC_NODE;
return CMD_SUCCESS;
}