FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dahdi: Save the current maintstat in the span before calling into the drivers.

Browse Source 
Some of the card callbacks needed maintstat set when processing loopup codes
from the remote side. This change is a modification of commit: (6c02c3c
"dahdi-base: Minor maint mode error")

Without this change cetain cards would not properly process the loopup /
loopdown codes (I know I should have more specific information here but the
details escape me at the moment).

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
This commit is contained in:
Shaun Ruffell 2013-04-04 14:42:52 -05:00
parent a8788692a1
commit f4d9cbbfb1
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/dahdi/dahdi-base.c
View File

@ -5366,7 +5366,8 @@ static int dahdi_ioctl_maint(unsigned long data)
spin_lock_irqsave(&s->lock, flags); spin_lock_irqsave(&s->lock, flags);
/* save current maint state */ /* save current maint state */
i = s->maintstat; i = s->maintstat;
/* set maint mode */
s->maintstat = maint.command;
switch (maint.command) { switch (maint.command) {
case DAHDI_MAINT_NONE: case DAHDI_MAINT_NONE:
case DAHDI_MAINT_LOCALLOOP: case DAHDI_MAINT_LOCALLOOP:
@ -5379,6 +5380,8 @@ static int dahdi_ioctl_maint(unsigned long data)
spin_unlock_irqrestore(&s->lock, flags); spin_unlock_irqrestore(&s->lock, flags);
if (rv) { if (rv) {
put_span(s); put_span(s);
/* Restore the state on error */
s->maintstat = i;
return rv; return rv;
} }
spin_lock_irqsave(&s->lock, flags); spin_lock_irqsave(&s->lock, flags);
@ -5390,6 +5393,8 @@ static int dahdi_ioctl_maint(unsigned long data)
spin_unlock_irqrestore(&s->lock, flags); spin_unlock_irqrestore(&s->lock, flags);
if (rv) { if (rv) {
put_span(s); put_span(s);
/* Restore the state on error */
s->maintstat = i;
return rv; return rv;
} }
spin_lock_irqsave(&s->lock, flags); spin_lock_irqsave(&s->lock, flags);
@ -5413,6 +5418,8 @@ static int dahdi_ioctl_maint(unsigned long data)
spin_unlock_irqrestore(&s->lock, flags); spin_unlock_irqrestore(&s->lock, flags);
if (rv) { if (rv) {
put_span(s); put_span(s);
/* Restore the state on error */
s->maintstat = i;
return rv; return rv;
} }
spin_lock_irqsave(&s->lock, flags); spin_lock_irqsave(&s->lock, flags);
@ -5423,12 +5430,10 @@ static int dahdi_ioctl_maint(unsigned long data)
"Unknown maintenance event: %d\n", "Unknown maintenance event: %d\n",
maint.command); maint.command);
put_span(s); put_span(s);
/* Restore the state on error */
s->maintstat = i;
return -ENOSYS; return -ENOSYS;
} }
/* set maint mode */
s->maintstat = maint.command;
dahdi_alarm_notify(s); /* process alarm-related events */ dahdi_alarm_notify(s); /* process alarm-related events */
spin_unlock_irqrestore(&s->lock, flags); spin_unlock_irqrestore(&s->lock, flags);
put_span(s); put_span(s);