Commit c6a2e587 authored by Andreas Eversberg's avatar Andreas Eversberg Committed by Karsten Keil

mISDN: Fix kernel crash when doing hardware conference with more than two members

Fix kernel crash when doing hardware conference with more than two members.
Removed DTMF threshold notice when debugging is disabled.
Signed-off-by: default avatarAndreas Eversberg <andreas@eversberg.eu>
Signed-off-by: default avatarKarsten Keil <kkeil@suse.de>
parent c3b3cdeb
...@@ -927,10 +927,6 @@ dsp_cmx_hardware(struct dsp_conf *conf, struct dsp *dsp) ...@@ -927,10 +927,6 @@ dsp_cmx_hardware(struct dsp_conf *conf, struct dsp *dsp)
/* for more than two members.. */ /* for more than two members.. */
/* in case of hdlc, we change to software */
if (dsp->hdlc)
goto conf_software;
/* if all members already have the same conference */ /* if all members already have the same conference */
if (all_conf) if (all_conf)
return; return;
...@@ -941,6 +937,9 @@ dsp_cmx_hardware(struct dsp_conf *conf, struct dsp *dsp) ...@@ -941,6 +937,9 @@ dsp_cmx_hardware(struct dsp_conf *conf, struct dsp *dsp)
if (current_conf >= 0) { if (current_conf >= 0) {
join_members: join_members:
list_for_each_entry(member, &conf->mlist, list) { list_for_each_entry(member, &conf->mlist, list) {
/* in case of hdlc, change to software */
if (member->dsp->hdlc)
goto conf_software;
/* join to current conference */ /* join to current conference */
if (member->dsp->hfc_conf == current_conf) if (member->dsp->hfc_conf == current_conf)
continue; continue;
......
...@@ -301,8 +301,9 @@ dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb) ...@@ -301,8 +301,9 @@ dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb)
if (dsp_debug & DEBUG_DSP_CORE) if (dsp_debug & DEBUG_DSP_CORE)
printk(KERN_DEBUG "%s: start dtmf\n", __func__); printk(KERN_DEBUG "%s: start dtmf\n", __func__);
if (len == sizeof(int)) { if (len == sizeof(int)) {
printk(KERN_NOTICE "changing DTMF Threshold " if (dsp_debug & DEBUG_DSP_CORE)
"to %d\n", *((int *)data)); printk(KERN_NOTICE "changing DTMF Threshold "
"to %d\n", *((int *)data));
dsp->dtmf.treshold = (*(int *)data) * 10000; dsp->dtmf.treshold = (*(int *)data) * 10000;
} }
/* init goertzel */ /* init goertzel */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment