Merge remote-tracking branch 'origin/issue_344_segv_trace_wireshark' into develop_integration_2018_w35

This commit is contained in:
Cedric Roux
2018-08-31 12:43:33 +02:00
20 changed files with 701 additions and 226 deletions
+1 -8
View File
@@ -975,14 +975,7 @@ int main( int argc, char **argv )
#endif
if (opt_type != OPT_NONE) {
radio_type_t radio_type;
if (frame_parms[0]->frame_type == FDD)
radio_type = RADIO_TYPE_FDD;
else
radio_type = RADIO_TYPE_TDD;
if (init_opt(in_path, in_ip, NULL, radio_type) == -1)
if (init_opt(in_path, in_ip) == -1)
LOG_E(OPT,"failed to run OPT \n");
}
+1 -8
View File
@@ -862,14 +862,7 @@ int main( int argc, char **argv )
#endif
if (opt_type != OPT_NONE) {
radio_type_t radio_type;
if (frame_parms[0]->frame_type == FDD)
radio_type = RADIO_TYPE_FDD;
else
radio_type = RADIO_TYPE_TDD;
if (init_opt(in_path, in_ip, NULL, radio_type) == -1)
if (init_opt(in_path, in_ip) == -1)
LOG_E(OPT,"failed to run OPT \n");
}