mISDN: Use list_count_nodes()
count_list_member() really looks the same as list_count_nodes(), so use the latter instead of hand writing it. The first one return an int and the other a size_t, but that should be fine. It is really unlikely that we get so many parties in a conference. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
6e98b09da9
Коммит
e0807c4302
|
@ -141,17 +141,6 @@
|
||||||
/*#define CMX_DELAY_DEBUG * gives rx-buffer delay overview */
|
/*#define CMX_DELAY_DEBUG * gives rx-buffer delay overview */
|
||||||
/*#define CMX_TX_DEBUG * massive read/write on tx-buffer with content */
|
/*#define CMX_TX_DEBUG * massive read/write on tx-buffer with content */
|
||||||
|
|
||||||
static inline int
|
|
||||||
count_list_member(struct list_head *head)
|
|
||||||
{
|
|
||||||
int cnt = 0;
|
|
||||||
struct list_head *m;
|
|
||||||
|
|
||||||
list_for_each(m, head)
|
|
||||||
cnt++;
|
|
||||||
return cnt;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* debug cmx memory structure
|
* debug cmx memory structure
|
||||||
*/
|
*/
|
||||||
|
@ -1672,7 +1661,7 @@ dsp_cmx_send(void *arg)
|
||||||
mustmix = 0;
|
mustmix = 0;
|
||||||
members = 0;
|
members = 0;
|
||||||
if (conf) {
|
if (conf) {
|
||||||
members = count_list_member(&conf->mlist);
|
members = list_count_nodes(&conf->mlist);
|
||||||
#ifdef CMX_CONF_DEBUG
|
#ifdef CMX_CONF_DEBUG
|
||||||
if (conf->software && members > 1)
|
if (conf->software && members > 1)
|
||||||
#else
|
#else
|
||||||
|
@ -1695,7 +1684,7 @@ dsp_cmx_send(void *arg)
|
||||||
/* loop all members that require conference mixing */
|
/* loop all members that require conference mixing */
|
||||||
list_for_each_entry(conf, &conf_ilist, list) {
|
list_for_each_entry(conf, &conf_ilist, list) {
|
||||||
/* count members and check hardware */
|
/* count members and check hardware */
|
||||||
members = count_list_member(&conf->mlist);
|
members = list_count_nodes(&conf->mlist);
|
||||||
#ifdef CMX_CONF_DEBUG
|
#ifdef CMX_CONF_DEBUG
|
||||||
if (conf->software && members > 1) {
|
if (conf->software && members > 1) {
|
||||||
#else
|
#else
|
||||||
|
|
Загрузка…
Ссылка в новой задаче