diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-09-25 17:01:20 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2016-09-28 00:28:01 +0000 |
| commit | 2afffd5cf67ad84c4fd8e589798b8697b809ebc5 (patch) | |
| tree | 882138c370c9aed6df6ef8c9824e9683361d8021 /openbsc/src/libbsc/bsc_ctrl_commands.c | |
| parent | e289a2a86a845759fe1ac75365a6dc54ee9671d3 (diff) | |
Revert "bts: extend bts_chan_load to allow counting tch only"
This reverts commit 308cb0719dca3ba8eed1eff2a2124d44f34d9a28.
Problems in this commit:
openbsc/src/libbsc/chan_alloc.c:523: case GSM_PCHAN_TCH_F_PDCH:
This is actually wrong, GSM_PCHAN_TCH_F_PDCH use ts->flags, not ts->dyn below
(due to historical reasons and could be unified).
560: if (only_count_tch && !chan_is_tch(ts))
This has exactly one effect: it excludes GSM_PCHAN_TCH_F_PDCH when in PDCH
mode, because for all other PDCH (plain PDCH and TCH/F_TCH/H_PDCH in PDCH mode)
below ts_subslots() returns 0 and skips the for() loop. I consider this a bug
in TCH/F_PDCH, to be fixed in an upcoming commit.
I don't see why we need the only_count_tch argument, because this should
normally only count TCH, weren't it for the TCH/F_PDCH bug.
If dyn TS should be counted differently, we should do this in a different way.
Change-Id: I34dbbaf53a800115e3d03bd44028cad675f3b525
Diffstat (limited to 'openbsc/src/libbsc/bsc_ctrl_commands.c')
| -rw-r--r-- | openbsc/src/libbsc/bsc_ctrl_commands.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openbsc/src/libbsc/bsc_ctrl_commands.c b/openbsc/src/libbsc/bsc_ctrl_commands.c index 3f4fee2a3..7e8479734 100644 --- a/openbsc/src/libbsc/bsc_ctrl_commands.c +++ b/openbsc/src/libbsc/bsc_ctrl_commands.c @@ -239,7 +239,7 @@ static int get_bts_chan_load(struct ctrl_cmd *cmd, void *data) bts = cmd->node; memset(&pl, 0, sizeof(pl)); - bts_chan_load(&pl, bts, 0); + bts_chan_load(&pl, bts); cmd->reply = talloc_strdup(cmd, ""); |