From 15ff405dc80b3dcb2904c5ff1334defdb6b6d383 Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Sun, 27 Apr 2014 15:21:00 +0300 Subject: [PATCH] xpp: pri: Fix more than a single CAS/R2 call Fixes regression from bb63d03bbad48f798177dfce62a1ee392d736c57 (before v2.7.0). This failed to set the PCM mask on a CAS span when DAHDI_AUDIO_NOTIFY was not set. As the first channel of each xbus would be enabled (for synchronization), a single call may still have passed. This patch sets the PCM mask on any CAS channel explicitly. Signed-off-by: Tzafrir Cohen --- drivers/dahdi/xpp/card_pri.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/dahdi/xpp/card_pri.c b/drivers/dahdi/xpp/card_pri.c index f4a40bf..29b457b 100644 --- a/drivers/dahdi/xpp/card_pri.c +++ b/drivers/dahdi/xpp/card_pri.c @@ -524,9 +524,12 @@ static void PRI_card_pcm_recompute(xpd_t *xpd, xpp_line_t pcm_mask) //XPD_DBG(SIGNAL, xpd, "pcm_mask=0x%X\n", pcm_mask); /* Add/remove all the trivial cases */ pcm_mask |= PHONEDEV(xpd).offhook_state; + if (priv->is_cas) + pcm_mask |= BITMASK(PHONEDEV(xpd).channels); for_each_line(xpd, i) if (IS_SET(pcm_mask, i)) line_count++; + else if (priv->is_cas) { if (priv->pri_protocol == PRI_PROTO_E1) { /* CAS: Don't send PCM to D-Channel */