From patchwork Tue Apr 24 12:51:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karsten Keil X-Patchwork-Id: 154671 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3C84CB6F62 for ; Tue, 24 Apr 2012 22:54:49 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754191Ab2DXMyn (ORCPT ); Tue, 24 Apr 2012 08:54:43 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:61411 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754081Ab2DXMym (ORCPT ); Tue, 24 Apr 2012 08:54:42 -0400 Received: from mailone.linux-pingi.de (p5497CC26.dip.t-dialin.net [84.151.204.38]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0MIRr9-1SNV8k01CZ-004FQI; Tue, 24 Apr 2012 14:54:37 +0200 Received: from pingi6.linux-pingi.de (pingi6.linux-pingi.de [10.23.200.6]) by mailone.linux-pingi.de (Postfix) with ESMTP id 8A5CC5276; Tue, 24 Apr 2012 14:54:34 +0200 (CEST) Received: by pingi6.linux-pingi.de (Postfix, from userid 1000) id E479A9FBA8; Tue, 24 Apr 2012 14:51:52 +0200 (CEST) From: Karsten Keil To: David Miller Cc: netdev@vger.kernel.org, Andreas Eversberg Subject: [PATCH 2/4] mISDN: Fixed hardware bridging/conference check routine of mISDN_dsp.ko. Date: Tue, 24 Apr 2012 14:51:50 +0200 Message-Id: <1335271912-5269-3-git-send-email-kkeil@linux-pingi.de> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1335271912-5269-1-git-send-email-kkeil@linux-pingi.de> References: <1335271912-5269-1-git-send-email-kkeil@linux-pingi.de> X-Provags-ID: V02:K0:FCZME7i6pP7xA8NlUSlfTxfcSvh1In30IFeVzb4CtcQ S+ZSHgwkx+0WAaC4y2djl4urrOXtqHGPvKyrBaC7pH/gwwsgN/ rwpoPdQLPMEh91c9lW79iOg1mt9ehP7DR5ClZgnoKIp5BHr0jL QI8uu0Dj8uriDADKswCVsCjovApeYN4IvwYipKPrpWjUngJAs/ 5fNz204ACbcCOb4Q0KLdDt7HkFQHScD8n1ijj2UTmjWNlsKVpm B8DqKMMs0zWKwtAItOZurXnPsj+U0R29ZMoW1a3q3jQw4nmEwU WPUdhJMVxgDdfwDDxW+frLczZ/RD/pHXpKE7cZ0qLg+8Q0NdBg vK/7luA3c7a+1Wy4DwtkPAtposMM3g0Q220/QBCpDdTpJI8jvl rFLvR6bApYM0FBNBr/z3CzvYMjlkXW/tas= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Andreas Eversberg In some 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; }