Merge remote branch 'qa-master/releases.3.4' into releases.3.4

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c

@@ -1610,8 +1610,10 @@ static ftdm_status_t ftdm_sangoma_ss7_start(ftdm_span_t * span)
 	sngss7_chan_data_t	*sngss7_info = NULL;
 	sngss7_span_data_t 	*sngss7_span = NULL;
 	sng_isup_inf_t		*sngss7_intf = NULL;
-	int 				x;
-	int					first_channel=0;
+	int 			x;
+	int			first_channel;
+
+	first_channel=0;
 
 
 	SS7_INFO ("Starting span %s:%u.\n", span->name, span->span_id);
@@ -1656,7 +1658,7 @@ static ftdm_status_t ftdm_sangoma_ss7_start(ftdm_span_t * span)
 			sngss7_clear_ckt_flag(sngss7_info, FLAG_INFID_PAUSED);
 			sngss7_set_ckt_flag(sngss7_info, FLAG_INFID_RESUME);
 		}
-#if 1
+#if 0
 		/* throw the grp reset flag */
 		sngss7_set_ckt_flag(sngss7_info, FLAG_GRP_RESET_TX);
 		if (first_channel == 0) {