#290 increase netmap startup from 4 to 10 seconds

fklassen · fklassen · commit 34133396f3ca · 2017-02-27T20:27:18.000-08:00
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
@@ -1,4 +1,5 @@
 02/26/2017 Version 4.2.0beta1
+    - Netmap startup delay increase (#209)
     - tcpcapinfo buffer overflow vulnerablily (#278)
     - Update git-clone instructions by Kyle McDonald (#277) 
     - Allow fractions for --pps option (#270)
diff --git a/src/tcpreplay_opts.def b/src/tcpreplay_opts.def
@@ -505,13 +505,12 @@ EOText;
 flag = {
     ifdef       = HAVE_NETMAP;
     name        = nm-delay;
-    flags-must  = netmap;
     arg-type    = number;
-    arg-default = 4;
+    arg-default = 10;
     descrip     = "Netmap startup delay";
     doc         = <<- EOText
 Number of seconds to delay after netmap is loaded. Required to ensure interfaces
-are fully up before netmap transmit. Requires netmap option. Default is 4 seconds.
+are fully up before netmap transmit. Requires netmap option. Default is 10 seconds.
 EOText;
 };
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`02/26/2017 Version 4.2.0beta1`
	`2`	`+ - Netmap startup delay increase (#209)`
`2`	`3`	`- tcpcapinfo buffer overflow vulnerablily (#278)`
`3`	`4`	`- Update git-clone instructions by Kyle McDonald (#277)`
`4`	`5`	`- Allow fractions for --pps option (#270)`