diff options
| -rw-r--r-- | include/osmocom/msc/gsm_data.h | 3 | ||||
| -rw-r--r-- | src/libcommon-cs/common_cs.c | 2 | ||||
| -rw-r--r-- | src/libcommon-cs/common_cs_vty.c | 13 | ||||
| -rw-r--r-- | src/osmo-msc/msc_main.c | 14 |
4 files changed, 0 insertions, 32 deletions
diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 444618cb4..cde1ce203 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -273,9 +273,6 @@ struct gsm_network { /* control interface */ struct ctrl_handle *ctrl; - /* Allow or disallow TCH/F on dynamic TCH/F_TCH/H_PDCH; OS#1778 */ - bool dyn_ts_allow_tch_f; - /* all active subscriber connections. */ struct llist_head subscr_conns; diff --git a/src/libcommon-cs/common_cs.c b/src/libcommon-cs/common_cs.c index 170b62a23..cebaf396d 100644 --- a/src/libcommon-cs/common_cs.c +++ b/src/libcommon-cs/common_cs.c @@ -78,8 +78,6 @@ struct gsm_network *gsm_network_init(void *ctx, net->mncc_recv = mncc_recv; - net->dyn_ts_allow_tch_f = true; - INIT_LLIST_HEAD(&net->a.bscs); return net; diff --git a/src/libcommon-cs/common_cs_vty.c b/src/libcommon-cs/common_cs_vty.c index 8c9f1275c..a4862ee77 100644 --- a/src/libcommon-cs/common_cs_vty.c +++ b/src/libcommon-cs/common_cs_vty.c @@ -216,18 +216,6 @@ DEFUN(cfg_net_mm_info, cfg_net_mm_info_cmd, return CMD_SUCCESS; } -DEFUN(cfg_net_dyn_ts_allow_tch_f, - cfg_net_dyn_ts_allow_tch_f_cmd, - "dyn_ts_allow_tch_f (0|1)", - "Allow or disallow allocating TCH/F on TCH_F_TCH_H_PDCH timeslots\n" - "Disallow TCH/F on TCH_F_TCH_H_PDCH (default)\n" - "Allow TCH/F on TCH_F_TCH_H_PDCH\n") -{ - struct gsm_network *gsmnet = gsmnet_from_vty(vty); - gsmnet->dyn_ts_allow_tch_f = atoi(argv[0]) ? true : false; - return CMD_SUCCESS; -} - DEFUN(cfg_net_timezone, cfg_net_timezone_cmd, "timezone <-19-19> (0|15|30|45)", @@ -346,7 +334,6 @@ int common_cs_vty_init(struct gsm_network *network, install_element(GSMNET_NODE, &cfg_net_no_timezone_cmd); install_element(GSMNET_NODE, &cfg_net_per_loc_upd_cmd); install_element(GSMNET_NODE, &cfg_net_no_per_loc_upd_cmd); - install_element(GSMNET_NODE, &cfg_net_dyn_ts_allow_tch_f_cmd); return CMD_SUCCESS; } diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 2413c4328..b0b78be31 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -402,20 +402,6 @@ int main(int argc, char **argv) return -1; #endif - /* - * For osmo-nitb, skip TCH/F for now, because otherwise dyn TS - * always imply the possibility to have a mix of TCH/F and - * TCH/H channels; if two phones request a TCH/F and a TCH/H, - * respectively, they cannot call each other. If we deny TCH/F, - * they will both fall back to TCH/H, and dynamic channels are - * usable. See OS#1778. - * - * A third-party MSC may well be able to handle a TCH/H TCH/F - * mismatch. Moreover, this option may be overwritten in the - * config file or in VTY. - */ - msc_network->dyn_ts_allow_tch_f = false; - rc = vty_read_config_file(msc_cmdline_config.config_file, NULL); if (rc < 0) { LOGP(DMSC, LOGL_FATAL, "Failed to parse the config file: '%s'\n", |