From fb59e4a85746b64df2578ee29d2276740775e5b6 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Sun, 15 May 2005 22:05:16 +0000
Subject: [PATCH] combine two lines of code to make the logic clearer (bug
 #4273)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5683 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 channels/chan_iax2.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 36711b7758..1b78bf7329 100755
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -6219,8 +6219,7 @@ static int socket_read(int *id, int fd, short events, void *cbdata)
 								else
 									f.data = NULL;
 								if(trunked_ts) {
-									fr.ts = trunked_ts;
-									fr.ts = (iaxs[fr.callno]->last & 0xFFFF0000L) | (fr.ts & 0xffff);
+									fr.ts = (iaxs[fr.callno]->last & 0xFFFF0000L) | (trunked_ts & 0xffff);
 								} else
 									fr.ts = fix_peerts(&rxtrunktime, fr.callno, ts);
 								/* Don't pass any packets until we're started */