[svn-commits] sruffell: linux/trunk r5576 - /linux/trunk/drivers/dahdi/wcb4xxp/base.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Wed Dec 17 09:57:56 2008
New Revision: 5576

URL: http://svn.digium.com/view/dahdi?view=rev&rev=5576
Log:
wcb4xxp: Do not propogate received HDLC frames on channels that are not
configured.  Issue: DAHDI-217

Modified:
    linux/trunk/drivers/dahdi/wcb4xxp/base.c

Modified: linux/trunk/drivers/dahdi/wcb4xxp/base.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wcb4xxp/base.c?view=diff&rev=5576&r1=5575&r2=5576
==============================================================================
--- linux/trunk/drivers/dahdi/wcb4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcb4xxp/base.c Wed Dec 17 09:57:56 2008
@@ -1579,7 +1579,8 @@
 		spin_unlock_irqrestore(&b4->fifolock, irq_flags);
 
 /* don't send STAT byte to DAHDI */
-		dahdi_hdlc_putbuf(bspan->sigchan, buf, (j == WCB4XXP_HDLC_BUF_LEN) ? j : j - 1);
+		if (bspan->sigchan)
+			dahdi_hdlc_putbuf(bspan->sigchan, buf, (j == WCB4XXP_HDLC_BUF_LEN) ? j : j - 1);
 
 		zleft -= j;
 		if (DBG_HDLC && DBG_SPANFILTER) {
@@ -1594,6 +1595,11 @@
 	hfc_setreg_waitbusy(b4, A_INC_RES_FIFO, V_INC_F);
 	get_F(f1, f2, flen);
 	spin_unlock_irqrestore(&b4->fifolock, irq_flags);
+
+	/* If this channel is not configured with a signalling span we don't
+	 * need to notify the rest of dahdi about this frame. */
+	if (!bspan->sigchan)
+		return flen;
 
 	++bspan->frames_in;
 	if (zlen < 3) {