Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/networking/interface.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/networking/interface.c (modified) (6 diffs)

branches/3.2/mindi-busybox/networking/interface.c

@@ -28 +28 @@
  *                     - gettext instead of catgets for i18n
  *          10/1998  - Andi Kleen. Use interface list primitives.
- *      20001008 - Bernd Eckenfels, Patch from RH for setting mtu
+ *          20001008 - Bernd Eckenfels, Patch from RH for setting mtu
  *          (default AF was wrong)
  */
+
+#include "libbb.h"
+#include "inet_common.h"
 #include <net/if.h>
 #include <net/if_arp.h>
-#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION)
+#ifdef HAVE_NET_ETHERNET_H
 # include <net/ethernet.h>
-#else
-# include <linux/if_ether.h>
-#endif
-#include "libbb.h"
-#include "inet_common.h"
+#endif
 
 #if ENABLE_FEATURE_HWIB
@@ -952 +951 @@
             sap.sin6_family = AF_INET6;
             printf("          inet6 addr: %s/%d",
-                   INET6_sprint((struct sockaddr *) &sap, 1),
-                   plen);
+                INET6_sprint((struct sockaddr *) &sap, 1),
+                plen);
             printf(" Scope:");
             switch (scope & IPV6_ADDR_SCOPE_MASK) {
@@ -1021 +1020 @@
     if (ptr->has_ip) {
         printf("          %s addr:%s ", ap->name,
-               ap->sprint(&ptr->addr, 1));
+            ap->sprint(&ptr->addr, 1));
         if (ptr->flags & IFF_POINTOPOINT) {
             printf(" P-t-P:%s ", ap->sprint(&ptr->dstaddr, 1));
@@ -1104 +1103 @@
 
         printf("RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n",
-               ptr->stats.rx_packets, ptr->stats.rx_errors,
-               ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors,
-               ptr->stats.rx_frame_errors);
+            ptr->stats.rx_packets, ptr->stats.rx_errors,
+            ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors,
+            ptr->stats.rx_frame_errors);
         if (can_compress)
             printf("             compressed:%lu\n",
-                   ptr->stats.rx_compressed);
+                ptr->stats.rx_compressed);
         printf("          ");
         printf("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n",
-               ptr->stats.tx_packets, ptr->stats.tx_errors,
-               ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors,
-               ptr->stats.tx_carrier_errors);
+            ptr->stats.tx_packets, ptr->stats.tx_errors,
+            ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors,
+            ptr->stats.tx_carrier_errors);
         printf("          collisions:%lu ", ptr->stats.collisions);
         if (can_compress)
@@ -1131 +1130 @@
         if (ptr->map.irq)
             printf("Interrupt:%d ", ptr->map.irq);
-        if (ptr->map.base_addr >= 0x100)    /* Only print devices using it for
-                                               I/O maps */
+        if (ptr->map.base_addr >= 0x100) /* Only print devices using it for I/O maps */
             printf("Base address:0x%lx ",
-                   (unsigned long) ptr->map.base_addr);
+                (unsigned long) ptr->map.base_addr);
         if (ptr->map.mem_start) {
             printf("Memory:%lx-%lx ", ptr->map.mem_start,
-                   ptr->map.mem_end);
+                ptr->map.mem_end);
         }
         if (ptr->map.dma)
@@ -1170 +1168 @@
 #ifdef UNUSED
 static int for_all_interfaces(int (*doit) (struct interface *, void *),
-                              void *cookie)
+                            void *cookie)
 {
     struct interface *ife;