Merge branch '2015_11_mod' into 'master'

[Bug #2881] 修正编译错误

修改:     mnic.c

	Signed-off-by: Zhang, Jialing <jlzhang@linx-info.com>

See merge request !1
This commit is contained in:
张家岭
2016-08-08 11:41:45 +08:00

View File

@@ -744,7 +744,7 @@ static void *cacu_flow(void *p)
printf("%s:\tcount=%d\tsummit=%d\tflow_limit:%d\taverage_flow:%lld\n", curr->info.charname, count_t, summit, conf.flow_limit, curr->info.average_flow);
#endif
snprintf(error_str, sizeof(error_str), "%s:\tcount=%d\tsummit=%d\tflow_limit:%d\taverage_flow:%lld\tbytes[%d]:%lld\tcurr->info.rx_bytes:%lld\tcurr->info.tx_bytes\n",
curr->info.charname, count_t, summit, conf.flow_limit, curr->info.average_flow,i,bytes[i],info.curr->rx_bytes,info.curr->tx_bytes);
curr->info.charname, count_t, summit, conf.flow_limit, curr->info.average_flow,i,bytes[i],curr->info.rx_bytes,curr->info.tx_bytes);
record_log(error_str);
}