[dahdi-commits] tzafrir: linux/trunk r9717 - /linux/trunk/drivers/dahdi/xpp/card_pri.c
SVN commits to the DAHDI project
dahdi-commits at lists.digium.com
Sun Jan 30 12:32:57 CST 2011
Author: tzafrir
Date: Sun Jan 30 12:32:53 2011
New Revision: 9717
URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9717
Log:
xpd_pri: Reduce indentation
Signed-off-by: Oron Peled <oron at actcom.co.il>
Acked-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Modified:
linux/trunk/drivers/dahdi/xpp/card_pri.c
Modified: linux/trunk/drivers/dahdi/xpp/card_pri.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/card_pri.c?view=diff&rev=9717&r1=9716&r2=9717
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/card_pri.c (original)
+++ linux/trunk/drivers/dahdi/xpp/card_pri.c Sun Jan 30 12:32:53 2011
@@ -1140,16 +1140,16 @@
* and prevent DChan definitions with CAS.
*/
if(is_sigtype_dchan(sigtype)) {
- if(VALID_DCHAN(priv) && DCHAN(priv) != chan->channo) {
+ if (VALID_DCHAN(priv) && DCHAN(priv) != chan->channo) {
ERR("channel %d (%s) marked DChan but also channel %d.\n",
chan->channo, chan->name, DCHAN(priv));
return -EINVAL;
- } else {
- XPD_DBG(GENERAL, xpd, "channel %d (%s) marked as DChan\n", chan->channo, chan->name);
- SET_DCHAN(priv, chan->channo);
- /* In T1, we don't know before-hand */
- if(priv->pri_protocol != PRI_PROTO_E1 && priv->is_cas != 0)
- set_mode_cas(xpd, 0);
+ }
+ XPD_DBG(GENERAL, xpd, "channel %d (%s) marked as DChan\n", chan->channo, chan->name);
+ SET_DCHAN(priv, chan->channo);
+ /* In T1, we don't know before-hand */
+ if(priv->pri_protocol != PRI_PROTO_E1 && priv->is_cas != 0) {
+ set_mode_cas(xpd, 0);
}
} else {
if(chan->channo == 1) {
More information about the dahdi-commits
mailing list