diff options
Diffstat (limited to 'openbsc/src/osmo-bsc')
| -rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_msc.c | 6 | ||||
| -rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_sccp.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_msc.c b/openbsc/src/osmo-bsc/osmo_bsc_msc.c index 42e805515..8d02624b4 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_msc.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_msc.c @@ -526,10 +526,8 @@ int osmo_bsc_msc_init(struct bsc_msc_data *data) return -1; } - data->ping_timer.cb = msc_ping_timeout_cb; - data->ping_timer.data = data; - data->pong_timer.cb = msc_pong_timeout_cb; - data->pong_timer.data = data; + osmo_timer_setup(&data->ping_timer, msc_ping_timeout_cb, data); + osmo_timer_setup(&data->pong_timer, msc_pong_timeout_cb, data); data->msc_con->write_queue.bfd.data = data; data->msc_con->connection_loss = msc_connection_was_lost; diff --git a/openbsc/src/osmo-bsc/osmo_bsc_sccp.c b/openbsc/src/osmo-bsc/osmo_bsc_sccp.c index 970d70e82..e242390ef 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_sccp.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_sccp.c @@ -232,10 +232,8 @@ enum bsc_con bsc_create_new_connection(struct gsm_subscriber_connection *conn, bsc_con->send_ping = send_ping; /* prepare the timers */ - bsc_con->sccp_it_timeout.cb = sccp_it_timeout; - bsc_con->sccp_it_timeout.data = bsc_con; - bsc_con->sccp_cc_timeout.cb = sccp_cc_timeout; - bsc_con->sccp_cc_timeout.data = bsc_con; + osmo_timer_setup(&bsc_con->sccp_it_timeout, sccp_it_timeout, bsc_con); + osmo_timer_setup(&bsc_con->sccp_cc_timeout, sccp_cc_timeout, bsc_con); INIT_LLIST_HEAD(&bsc_con->sccp_queue); |