From: David Yat Sin <dyatsin@sangoma.com>
Date: Mon, 20 Dec 2010 22:08:15 +0000 (-0500)
Subject: Merge branch 'master' into netborder
X-Git-Tag: v1.2-rc1~230
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2d7957142fbead7b71f2d183f5de2e6893ab874;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into netborder

Conflicts:
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
---

c2d7957142fbead7b71f2d183f5de2e6893ab874
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
index fd9edeba8d,e7488c72ab..e63ed16a77
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
@@@ -120,10 -132,7 +132,7 @@@ void sngisdn_trace_raw_q921(sngisdn_spa
  	
  	sigev.ev_data.trace.dir = dir;
  	sigev.ev_data.trace.type = FTDM_TRACE_TYPE_Q921;
 -
 +	
- 	/* TODO: Map trace to call ID here */
- 	sigev.call_id = 0;
- 	
  	raw_data = ftdm_malloc(data_len);
  	ftdm_assert(raw_data, "Failed to malloc");