automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@56455 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index db1ee8e6acc37083657413301e4324f367f6d8cb..1e23a726ec8864b8c4df86b03c688554d89ce7c5 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -9669,15 +9669,20 @@ static int __unload_module(void)
        delete_users();
        iax_provision_unload();
        sched_context_destroy(sched);
-       return 0;
-}
 
-int unload_module()
-{
        ast_mutex_destroy(&iaxq.lock);
        ast_mutex_destroy(&userl.lock);
        ast_mutex_destroy(&peerl.lock);
        ast_mutex_destroy(&waresl.lock);
+
+       for (x = 0; x < IAX_MAX_CALLS; x++)
+               ast_mutex_destroy(&iaxsl[x]);
+
+       return 0;
+}
+
+int unload_module()
+{
        ast_custom_function_unregister(&iaxpeer_function);
        return __unload_module();
 }