diff options
author | David S. Miller <davem@davemloft.net> | 2021-10-22 11:41:16 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2021-10-22 11:41:16 +0100 |
commit | bdfa75ad70e93633e18b1ed2b3866c01aa9bf9d2 (patch) | |
tree | 45115e9c988cbaa49f3766cbe6e6775757cb8c20 /tools/testing/selftests/net/forwarding/forwarding.config.sample | |
parent | ab98bbee072c7c30c391ae742b209efebb468273 (diff) | |
parent | 64222515138e43da1fcf288f0289ef1020427b87 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Lots of simnple overlapping additions.
With a build fix from Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/testing/selftests/net/forwarding/forwarding.config.sample')
-rw-r--r-- | tools/testing/selftests/net/forwarding/forwarding.config.sample | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/testing/selftests/net/forwarding/forwarding.config.sample b/tools/testing/selftests/net/forwarding/forwarding.config.sample index 10ce3720aa6f..bf17e485684f 100644 --- a/tools/testing/selftests/net/forwarding/forwarding.config.sample +++ b/tools/testing/selftests/net/forwarding/forwarding.config.sample @@ -42,3 +42,6 @@ PING_TIMEOUT=5 # Flag for tc match, supposed to be skip_sw/skip_hw which means do not process # filter by software/hardware TC_FLAG=skip_hw +# IPv6 traceroute utility name. +TROUTE6=traceroute6 + |