diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-01-06 14:13:44 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-01-06 14:52:51 +0100 |
| commit | 1cc7184bc993f0b5f8eb9c41a2f6727e934604d2 (patch) | |
| tree | f0a2f37a0cb2e3b4c2d7684b6b13e4b710f6a15d | |
| parent | 02d45c00f5ca888cbd6dfa7aab3c065495104427 (diff) | |
misc: Fix compiler warning about incompatible pointers
| -rw-r--r-- | openbsc/include/openbsc/mncc.h | 2 | ||||
| -rw-r--r-- | openbsc/src/bsc/osmo_bsc_main.c | 2 | ||||
| -rw-r--r-- | openbsc/src/bsc_hack.c | 2 | ||||
| -rw-r--r-- | openbsc/src/mncc_sock.c | 5 |
4 files changed, 6 insertions, 5 deletions
diff --git a/openbsc/include/openbsc/mncc.h b/openbsc/include/openbsc/mncc.h index 9a9648d4d..075c5b5ce 100644 --- a/openbsc/include/openbsc/mncc.h +++ b/openbsc/include/openbsc/mncc.h @@ -165,6 +165,6 @@ void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg); int int_mncc_recv(struct gsm_network *net, struct msgb *msg); /* input from CC code into mncc_sock */ -void mncc_sock_from_cc(struct gsm_network *net, struct msgb *msg); +int mncc_sock_from_cc(struct gsm_network *net, struct msgb *msg); #endif diff --git a/openbsc/src/bsc/osmo_bsc_main.c b/openbsc/src/bsc/osmo_bsc_main.c index 3fb924798..62a4e0ef6 100644 --- a/openbsc/src/bsc/osmo_bsc_main.c +++ b/openbsc/src/bsc/osmo_bsc_main.c @@ -51,7 +51,7 @@ extern const char *openbsc_copyright; static int daemonize = 0; extern void bsc_vty_init(void); -extern int bsc_bootstrap_network(int (*layer4)(struct gsm_network *, int, void *), const char *cfg_file); +extern int bsc_bootstrap_network(int (*layer4)(struct gsm_network *, struct msgb *), const char *cfg_file); static void print_usage() { diff --git a/openbsc/src/bsc_hack.c b/openbsc/src/bsc_hack.c index 7f664238c..11499ab40 100644 --- a/openbsc/src/bsc_hack.c +++ b/openbsc/src/bsc_hack.c @@ -54,7 +54,7 @@ static int use_mncc_sock = 0; #define DB_SYNC_INTERVAL 60, 0 static struct timer_list db_sync_timer; -extern int bsc_bootstrap_network(int (*mmc_rev)(struct gsm_network *, int, void *), +extern int bsc_bootstrap_network(int (*mncc_recv)(struct gsm_network *, struct msgb *), const char *cfg_file); extern int bsc_shutdown_net(struct gsm_network *net); diff --git a/openbsc/src/mncc_sock.c b/openbsc/src/mncc_sock.c index 3f13075ff..2eef7c86e 100644 --- a/openbsc/src/mncc_sock.c +++ b/openbsc/src/mncc_sock.c @@ -48,7 +48,7 @@ struct mncc_sock_state { static struct mncc_sock_state *g_state; /* input from CC code into mncc_sock */ -void mncc_sock_from_cc(struct gsm_network *net, struct msgb *msg) +int mncc_sock_from_cc(struct gsm_network *net, struct msgb *msg) { struct gsm_mncc *mncc_in = (struct gsm_mncc *) msgb_data(msg); int msg_type = mncc_in->msg_type; @@ -69,7 +69,7 @@ void mncc_sock_from_cc(struct gsm_network *net, struct msgb *msg) } /* free the original message */ msgb_free(msg); - return; + return -1; } /* FIXME: check for some maximum queue depth? */ @@ -77,6 +77,7 @@ void mncc_sock_from_cc(struct gsm_network *net, struct msgb *msg) /* Actually enqueue the message and mark socket write need */ msgb_enqueue(&net->upqueue, msg); g_state->conn_bfd.when |= BSC_FD_WRITE; + return 0; } void mncc_sock_write_pending(void) |