From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karsten Keil Subject: [PATCH 02/28] mISDN: Fixed hardware bridging/conference check routine of mISDN_dsp.ko. Date: Sat, 17 Mar 2012 10:29:01 +0100 Message-ID: <20120423170549.89E1C9FBA7@pingi6.linux-pingi.de> Cc: netdev@vger.kernel.org, isdn4linux@listserv.isdn4linux.de To: David Miller Return-path: Received: from moutng.kundenserver.de ([212.227.17.10]:57507 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754146Ab2DWRIW (ORCPT ); Mon, 23 Apr 2012 13:08:22 -0400 Sender: netdev-owner@vger.kernel.org List-ID: From: Andreas Eversberg In come cases the hardware bridging/conference (2-n parties) was selected, but still pure software bridging/conference was used. Signed-off-by: Andreas Eversberg Signed-off-by: Karsten Keil --- drivers/isdn/mISDN/dsp_cmx.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c index b7589c2..0c104b9 100644 --- a/drivers/isdn/mISDN/dsp_cmx.c +++ b/drivers/isdn/mISDN/dsp_cmx.c @@ -742,8 +742,8 @@ dsp_cmx_hardware(struct dsp_conf *conf, struct dsp *dsp) member->dsp->pcm_slot_tx, member->dsp->pcm_bank_tx, member->dsp->pcm_bank_rx); - conf->hardware = 0; - conf->software = 1; + conf->hardware = 1; + conf->software = tx_data; return; } /* find a new slot */ @@ -834,8 +834,8 @@ dsp_cmx_hardware(struct dsp_conf *conf, struct dsp *dsp) nextm->dsp->name, member->dsp->pcm_slot_tx, member->dsp->pcm_slot_rx); - conf->hardware = 0; - conf->software = 1; + conf->hardware = 1; + conf->software = tx_data; return; } /* find two new slot */ @@ -939,8 +939,11 @@ dsp_cmx_hardware(struct dsp_conf *conf, struct dsp *dsp) /* for more than two members.. */ /* if all members already have the same conference */ - if (all_conf) + if (all_conf) { + conf->hardware = 1; + conf->software = tx_data; return; + } /* * if there is an existing conference, but not all members have joined @@ -1013,6 +1016,8 @@ dsp_cmx_hardware(struct dsp_conf *conf, struct dsp *dsp) dsp_cmx_hw_message(member->dsp, MISDN_CTRL_HFC_CONF_JOIN, current_conf, 0, 0, 0); } + conf->hardware = 1; + conf->software = tx_data; return; } -- 1.7.3.4