[asterisk-commits] irroot: branch irroot/distrotech-customers-1.8 r322061 - /team/irroot/distrot...

[SVN commits to the Asterisk project]

Author: irroot
Date: Mon Jun  6 06:49:18 2011
New Revision: 322061

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=322061
Log:
Remove Redundant code

Modified:
    team/irroot/distrotech-customers-1.8/channels/chan_sip.c

Modified: team/irroot/distrotech-customers-1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/channels/chan_sip.c?view=diff&rev=322061&r1=322060&r2=322061
==============================================================================
--- team/irroot/distrotech-customers-1.8/channels/chan_sip.c (original)
+++ team/irroot/distrotech-customers-1.8/channels/chan_sip.c Mon Jun  6 06:49:18 2011
@@ -6427,10 +6427,7 @@
 	}
 	p = newchan->tech_pvt;
 
-	while (sip_pvt_trylock(p)) {
-		CHANNEL_DEADLOCK_AVOIDANCE(oldchan);
-	}
-
+	sip_pvt_lock(p);
 	append_history(p, "Masq", "Old channel: %s\n", oldchan->name);
 	append_history(p, "Masq (cont)", "...new owner: %s\n", newchan->name);
 	if (p->owner != oldchan)
@@ -6456,10 +6453,6 @@
 {
 	struct sip_pvt *p = ast->tech_pvt;
 	int res = 0;
-
-	if (!p) {
-		return res;
-	}
 
 	sip_pvt_lock(p);
 	switch (ast_test_flag(&p->flags[0], SIP_DTMF)) {