[svn-commits] tzafrir: branch linux/2.5 r10336 - /linux/branches/2.5/drivers/dahdi/xpp/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Sun Nov 13 03:52:28 2011
New Revision: 10336

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10336
Log:
xpp: silence some bad ioctl() reporting

Ignore some FXS-specific ioctl-s in xpd_pri.

Signed-off-by: Oron Peled <oron.peled at xorcom.com>
Acked-by Tzafrir Cohen <tzafrir.cohen at xorcom.com>

Modified:
    linux/branches/2.5/drivers/dahdi/xpp/card_pri.c

Modified: linux/branches/2.5/drivers/dahdi/xpp/card_pri.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.5/drivers/dahdi/xpp/card_pri.c?view=diff&rev=10336&r1=10335&r2=10336
==============================================================================
--- linux/branches/2.5/drivers/dahdi/xpp/card_pri.c (original)
+++ linux/branches/2.5/drivers/dahdi/xpp/card_pri.c Sun Nov 13 03:52:28 2011
@@ -1424,14 +1424,17 @@
 		return -ENODEV;
 	chan = XPD_CHAN(xpd, pos);
 	switch (cmd) {
+		/*
+		 * Asterisk may send FXS type ioctl()'s to us:
+		 *   - Some are sent to everybody (DAHDI_TONEDETECT)
+		 *   - Some are sent because we may be in CAS mode
+		 *     (FXS signalling)
+		 * Ignore them.
+		 */
 		case DAHDI_TONEDETECT:
-			/*
-			 * Asterisk call all span types with this (FXS specific)
-			 * call. Silently ignore it.
-			 */
 			LINE_DBG(SIGNAL, xpd, pos, "PRI: TONEDETECT (%s)\n",
 				(chan->flags & DAHDI_FLAG_AUDIO) ?
-					"AUDIO" : "SILENCE");
+				"AUDIO" : "SILENCE");
 			return -ENOTTY;
 		case DAHDI_ONHOOKTRANSFER:
 			LINE_DBG(SIGNAL, xpd, pos, "PRI: ONHOOKTRANSFER\n");
@@ -1442,6 +1445,10 @@
 		case DAHDI_VMWI_CONFIG:
 			LINE_DBG(SIGNAL, xpd, pos, "PRI: VMWI_CONFIG\n");
 			return -ENOTTY;
+		case DAHDI_SETPOLARITY:
+			LINE_DBG(SIGNAL, xpd, pos, "PRI: SETPOLARITY\n");
+			return -ENOTTY;
+		/* report on really bad ioctl()'s */
 		default:
 			report_bad_ioctl(THIS_MODULE->name, xpd, pos, cmd);
 			return -ENOTTY;