Unify ping and ping6. ping has -4 and -6 which force

name resolution into IP or IPv6 only, otherwise
we take address family returned by host2sockaddr()
in lsa->sa.sa_family. IOW: "ping ::1" with do IPv6 ping,
"ping 127.0.0.1" will do IPv4 ping.
ping6 is aliased to "ping -6".

1 files changed, 5 insertions, 13 deletions

diff --git a/networking/Config.in b/networking/Config.in
index 0251a1401..2235dbe3f 100644
--- a/networking/Config.in
+++ b/networking/Config.in
@@ -501,27 +501,19 @@ config PING
           ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
           elicit an ICMP ECHO_RESPONSE from a host or gateway.
 
-config FEATURE_FANCY_PING
-        bool "Enable fancy ping output"
-        default y
-        depends on PING
-        help
-          Make the output from the ping applet include statistics, and at the
-          same time provide full support for ICMP packets.
-
 config PING6
         bool "ping6"
         default n
-        depends on FEATURE_IPV6
+        depends on FEATURE_IPV6 && PING
         help
           This will give you a ping that can talk IPv6.
 
-config FEATURE_FANCY_PING6
-        bool "Enable fancy ping6 output"
+config FEATURE_FANCY_PING
+        bool "Enable fancy ping output"
         default y
-        depends on PING6
+        depends on PING
         help
-          Make the output from the ping6 applet include statistics, and at the
+          Make the output from the ping applet include statistics, and at the
           same time provide full support for ICMP packets.
 
 config ROUTE