diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-05-14 02:42:15 +0800 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-05-14 02:42:15 +0800 |
| commit | 7373109abc9829c49eabf26e951a0ec6647666ac (patch) | |
| tree | f508489f955c15fc36376374072cfb8ce6a9e6de /openbsc/src/bs11_config.c | |
| parent | c1cb5eb38d5199de9049c59dc080051deba7aa53 (diff) | |
| parent | cf5cc5bb5b472f470eb9584a32dee3c38413f93a (diff) | |
Merge branch 'master' into on-waves/mgcp
Diffstat (limited to 'openbsc/src/bs11_config.c')
| -rw-r--r-- | openbsc/src/bs11_config.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/openbsc/src/bs11_config.c b/openbsc/src/bs11_config.c index a7493b422..8f6de8a77 100644 --- a/openbsc/src/bs11_config.c +++ b/openbsc/src/bs11_config.c @@ -481,7 +481,7 @@ static int handle_state_resp(enum abis_bs11_phase state) * argument, so our swload_cbfn can distinguish * a safety load from a regular software */ if (file_is_readable(fname_safety)) - rc = abis_nm_software_load(g_bts, fname_safety, + rc = abis_nm_software_load(g_bts, 0xff, fname_safety, win_size, param_forced, swload_cbfn, g_bts); else @@ -697,7 +697,8 @@ int handle_serial_msg(struct msgb *rx_msg) } int nm_state_event(enum nm_evt evt, u_int8_t obj_class, void *obj, - struct gsm_nm_state *old_state, struct gsm_nm_state *new_state) + struct gsm_nm_state *old_state, struct gsm_nm_state *new_state, + struct abis_om_obj_inst *obj_ins) { return 0; } |