Fix compilation error when FEATURE_FANCY_PING enabled. Also

reorder networking/Config.in moving FEATURE_FANCY_PING next to
PING6.  (Cristian Ionescu-Idbohrn)

diff --git a/networking/Config.in b/networking/Config.in
index cd986b862be58904326608fa86dfdeb93c0fa2e1..e8820e10de6c96eb7065eebd38ab97d1bf11a0be 100644 (file)
--- a/networking/Config.in
+++ b/networking/Config.in
@@ -645,12 +645,6 @@ config PING6
        help
          This will give you a ping that can talk IPv6.
 
-config PSCAN
-       bool "pscan"
-       default n
-       help
-         Simple network port scanner.
-
 config FEATURE_FANCY_PING
        bool "Enable fancy ping output"
        default y
@@ -659,6 +653,12 @@ config FEATURE_FANCY_PING
          Make the output from the ping applet include statistics, and at the
          same time provide full support for ICMP packets.
 
+config PSCAN
+       bool "pscan"
+       default n
+       help
+         Simple network port scanner.
+
 config ROUTE
        bool "route"
        default n

diff --git a/networking/ping.c b/networking/ping.c
index 382389dc21192e035242544bf32d652d9f291704..11138c036d657569597a75444bd92d8ef8cfe9e2 100644 (file)
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -94,7 +94,7 @@ static void ping4(len_and_sockaddr *lsa)
        char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
 
        pingsock = create_icmp_socket();
-       pingaddr = lsa->sin;
+       pingaddr = lsa->u.sin;
 
        pkt = (struct icmp *) packet;
        memset(pkt, 0, sizeof(packet));
@@ -138,7 +138,7 @@ static void ping6(len_and_sockaddr *lsa)
        char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
 
        pingsock = create_icmp6_socket();
-       pingaddr = lsa->sin6;
+       pingaddr = lsa->u.sin6;
 
        pkt = (struct icmp6_hdr *) packet;
        memset(pkt, 0, sizeof(packet));