aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-31 20:55:47 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-31 20:55:47 +0000
commit95c89b74bc86216e078d2ce7800d78374d6780ad (patch)
tree00b738acd69d66f1fbe346fdc88b0e5de9fe053d /channels
parentfee31fbedbd262e9f55b626e65f97a240cfe366d (diff)
Use AST_SCHED_DEL_SPINLOCK instead of manually using the logic.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@185531 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 76aaa2a7d..4b8bb3730 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2215,9 +2215,7 @@ static void __sip_ack(struct sip_pvt *p, int seqno, int resp, int sipmethod)
* the packet's retransid will be set to -1. The atomicity of the setting and checking
* of the retransid to -1 is ensured since in both cases p's lock is held.
*/
- while (cur->retransid > -1 && ast_sched_del(sched, cur->retransid)) {
- DEADLOCK_AVOIDANCE(&p->lock);
- }
+ AST_SCHED_DEL_SPINLOCK(sched, cur->retransid, &p->lock);
free(cur);
break;
}