summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTzafrir Cohen <tzafrir.cohen@xorcom.com>2011-11-13 09:52:28 +0000
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>2011-11-13 09:52:28 +0000
commit9d11f46bace957873e7802b1094869dae5611602 (patch)
treecc85cd5c6911d2a746d3a9e0e129fd178ea9d4a8
parent26ef786083c24f8492fe16e101ba591f6b46f76f (diff)
xpp: silence some bad ioctl() reporting
Ignore some FXS-specific ioctl-s in xpd_pri. Signed-off-by: Oron Peled <oron.peled@xorcom.com> Acked-by Tzafrir Cohen <tzafrir.cohen@xorcom.com> git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.5@10336 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r--drivers/dahdi/xpp/card_pri.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/drivers/dahdi/xpp/card_pri.c b/drivers/dahdi/xpp/card_pri.c
index 947fc6c..0ec7414 100644
--- a/drivers/dahdi/xpp/card_pri.c
+++ b/drivers/dahdi/xpp/card_pri.c
@@ -1424,14 +1424,17 @@ static int PRI_card_ioctl(xpd_t *xpd, int pos, unsigned int cmd, unsigned long a
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 @@ static int PRI_card_ioctl(xpd_t *xpd, int pos, unsigned int cmd, unsigned long a
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;