summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Meyerriecks <rmeyerreicks@digium.com>2010-03-09 02:38:27 +0000
committerRuss Meyerriecks <rmeyerreicks@digium.com>2010-03-09 02:38:27 +0000
commit0a947376611242fdd61913c24728566d0fa05593 (patch)
treef76fb50cbe9c7dad2a1879d6ef6e23b1d8c32ee2
parent59fce3f780a759de7286ec399d4c1d75143f7f33 (diff)
dahdi-base: Minor bugfix for alarm state indication
Fixed a minor issue where stateless DAHDI_MAINT ioctl commands, such as error insertion and clearing, were indicating the span going into loopback alarm state when it really was not. git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@8298 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r--drivers/dahdi/dahdi-base.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index 601aa59..d0aa29c 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -4533,6 +4533,10 @@ static int dahdi_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long da
case DAHDI_MAINT_BIPOLAR_DEFECT:
case DAHDI_MAINT_PRBS:
case DAHDI_RESET_COUNTERS:
+ /* Prevent notifying an alarm state for generic
+ maintenance functions */
+ spans[maint.spanno]->maintstat = 0;
+
rv = spans[maint.spanno]->maint(spans[maint.spanno],
maint.command);
spin_unlock_irqrestore(&spans[maint.spanno]->lock,