diff options
Diffstat (limited to 'drivers/dahdi/dahdi-base.c')
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 47 |
1 files changed, 31 insertions, 16 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 12d57a6..a54f3b0 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -3483,7 +3483,6 @@ void dahdi_alarm_notify(struct dahdi_span *span) int x; span->alarms &= ~DAHDI_ALARM_LOOPBACK; - span->alarms &= ~DAHDI_ALARM_SYNC; /* Determine maint status */ if (span->maintstat || span->mainttimer) span->alarms |= DAHDI_ALARM_LOOPBACK; @@ -3499,27 +3498,43 @@ void dahdi_alarm_notify(struct dahdi_span *span) for (x=1; x<maxspans; x++) { if (spans[x] && !spans[x]->alarms && (spans[x]->flags & DAHDI_FLAG_RUNNING)) { if (master != spans[x]) { - module_printk(KERN_NOTICE, "Master changed to %s\n", spans[x]->name); - span->alarms |= DAHDI_ALARM_SYNC; + module_printk(KERN_NOTICE, + "Master changed to %s\n", + spans[x]->name); } master = spans[x]; break; } } - /* XXX: Remove - Report more detailed alarms */ - if (span->alarms & DAHDI_ALARM_LOS) - module_printk(KERN_NOTICE, "Span %d: Loss of signal\n", span->spanno); - if (span->alarms & DAHDI_ALARM_LFA) - module_printk(KERN_NOTICE, "Span %d: Loss of Frame Alignment\n", span->spanno); - if (span->alarms & DAHDI_ALARM_LMFA) - module_printk(KERN_NOTICE, "Span %d: Loss of Multi-Frame Alignment\n", span->spanno); - if (span->alarms & DAHDI_ALARM_XLS) - module_printk(KERN_NOTICE, "Span %d: Transmit Line Short\n", span->spanno); - if (span->alarms & DAHDI_ALARM_XLO) - module_printk(KERN_NOTICE, "Span %d: Transmit Line Open\n", span->spanno); - if (span->alarms & DAHDI_ALARM_SYNC) - module_printk(KERN_NOTICE, "Span %d: Change of syncronization signal\n", span->spanno); + /* Report more detailed alarms */ + if (debug) { + if (span->alarms & DAHDI_ALARM_LOS) { + module_printk(KERN_NOTICE, + "Span %d: Loss of signal\n", + span->spanno); + } + if (span->alarms & DAHDI_ALARM_LFA) { + module_printk(KERN_NOTICE, + "Span %d: Loss of Frame Alignment\n", + span->spanno); + } + if (span->alarms & DAHDI_ALARM_LMFA) { + module_printk(KERN_NOTICE, + "Span %d: Loss of Multi-Frame "\ + "Alignment\n", span->spanno); + } + if (span->alarms & DAHDI_ALARM_XLS) { + module_printk(KERN_NOTICE, + "Span %d: Transmit Line Short\n", + span->spanno); + } + if (span->alarms & DAHDI_ALARM_XLO) { + module_printk(KERN_NOTICE, + "Span %d: Transmit Line Open\n", + span->spanno); + } + } } } |