From 016ba29ec23c65ff3ccbd12e6128384567d34406 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 20 Dec 2010 16:21:18 +0100 Subject: msc: Remove the msc_clear_queue now that it is not needed --- include/bsc_data.h | 1 - src/links.c | 4 ++++ src/main.c | 12 ------------ src/main_udt.c | 10 ---------- src/msc_conn.c | 5 ----- 5 files changed, 4 insertions(+), 28 deletions(-) diff --git a/include/bsc_data.h b/include/bsc_data.h index b8c9b26..7ac39f8 100644 --- a/include/bsc_data.h +++ b/include/bsc_data.h @@ -134,7 +134,6 @@ void msc_send_rlc(struct bsc_data *bsc, struct sccp_source_reference *src, struc void msc_send_reset(struct bsc_data *bsc); void msc_send_msg(struct bsc_data *bsc, int rc, struct sccp_parse_result *, struct msgb *msg); void msc_send_direct(struct bsc_data *bsc, struct msgb *msg); -void msc_clear_queue(struct bsc_data *data); void msc_close_connection(struct bsc_data *data); /* connection tracking and action */ diff --git a/src/links.c b/src/links.c index cc0f358..9ddd98d 100644 --- a/src/links.c +++ b/src/links.c @@ -27,6 +27,10 @@ extern struct bsc_data bsc; +void mtp_link_sccp_down(struct mtp_link *link) +{ +} + void mtp_link_submit(struct mtp_link *link, struct msgb *msg) { bsc.link.write(&bsc.link, msg); diff --git a/src/main.c b/src/main.c index 5546ded..c922474 100644 --- a/src/main.c +++ b/src/main.c @@ -83,11 +83,6 @@ static void mgcp_reset(struct bsc_data *bsc) /* * methods called from the MTP Level3 part */ -void mtp_link_sccp_down(struct mtp_link *link) -{ - msc_clear_queue(&bsc); -} - void mtp_link_forward_sccp(struct mtp_link *link, struct msgb *_msg, int sls) { int rc; @@ -96,7 +91,6 @@ void mtp_link_forward_sccp(struct mtp_link *link, struct msgb *_msg, int sls) rc = bss_patch_filter_msg(_msg, &result); if (rc == BSS_FILTER_RESET) { LOGP(DMSC, LOGL_NOTICE, "Filtering BSS Reset from the BSC\n"); - msc_clear_queue(&bsc); mgcp_reset(&bsc); send_reset_ack(link, sls); return; @@ -288,9 +282,6 @@ void release_bsc_resources(struct bsc_data *bsc) bsc->reset_count = 0; bsc_schedule_timer(&bsc->reset_timeout, 10, 0); } - - /* clear pending messages from the MSC */ - msc_clear_queue(bsc); } void bsc_link_down(struct link_data *data) @@ -306,9 +297,6 @@ void bsc_link_down(struct link_data *data) data->clear_queue(data); - /* clear pending messages from the MSC */ - msc_clear_queue(data->bsc); - /* If we have an A link send a reset to the MSC */ msc_send_reset(data->bsc); } diff --git a/src/main_udt.c b/src/main_udt.c index 07bf587..3e92bf2 100644 --- a/src/main_udt.c +++ b/src/main_udt.c @@ -65,11 +65,6 @@ extern void cell_vty_init(void); /* * methods called from the MTP Level3 part */ -void mtp_link_sccp_down(struct mtp_link *link) -{ - msc_clear_queue(&bsc); -} - void mtp_link_forward_sccp(struct mtp_link *link, struct msgb *_msg, int sls) { msc_send_direct(&bsc, _msg); @@ -86,9 +81,6 @@ void bsc_link_down(struct link_data *data) data->clear_queue(data); - /* clear pending messages from the MSC */ - msc_clear_queue(data->bsc); - /* If we have an A link send a reset to the MSC */ msc_send_reset(data->bsc); } @@ -257,8 +249,6 @@ int main(int argc, char **argv) void release_bsc_resources(struct bsc_data *bsc) { - /* clear pending messages from the MSC */ - msc_clear_queue(bsc); } struct msgb *create_sccp_rlc(struct sccp_source_reference *src_ref, diff --git a/src/msc_conn.c b/src/msc_conn.c index 9f8e4c6..5d1b329 100644 --- a/src/msc_conn.c +++ b/src/msc_conn.c @@ -53,11 +53,6 @@ int send_or_queue_bsc_msg(struct mtp_link *link, int sls, struct msgb *msg) return 0; } - -void msc_clear_queue(struct bsc_data *data) -{ -} - void msc_close_connection(struct bsc_data *bsc) { struct bsc_fd *bfd = &bsc->msc_connection.bfd; -- cgit v1.2.3