projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ifenslave: fix missing close paren
[oweals/busybox.git]
/
networking
/
ifconfig.c
diff --git
a/networking/ifconfig.c
b/networking/ifconfig.c
index 220b02126a6d02774c0fc67941b558057ead5c47..b6604f5d15a0e4ff2bf1677f57208b187466afb7 100644
(file)
--- a/
networking/ifconfig.c
+++ b/
networking/ifconfig.c
@@
-30,7
+30,6
@@
//usage: IF_FEATURE_IFCONFIG_STATUS("[-a]") " interface [address]"
//usage:#define ifconfig_full_usage "\n\n"
//usage: "Configure a network interface\n"
//usage: IF_FEATURE_IFCONFIG_STATUS("[-a]") " interface [address]"
//usage:#define ifconfig_full_usage "\n\n"
//usage: "Configure a network interface\n"
-//usage: "\nOptions:"
//usage: "\n"
//usage: IF_FEATURE_IPV6(
//usage: " [add ADDRESS[/PREFIXLEN]]\n")
//usage: "\n"
//usage: IF_FEATURE_IPV6(
//usage: " [add ADDRESS[/PREFIXLEN]]\n")
@@
-47,18
+46,14
@@
//usage: " [mem_start NN] [io_addr NN] [irq NN]\n")
//usage: " [up|down] ..."
//usage: " [mem_start NN] [io_addr NN] [irq NN]\n")
//usage: " [up|down] ..."
+#include "libbb.h"
+#include "inet_common.h"
#include <net/if.h>
#include <net/if_arp.h>
#include <netinet/in.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <netinet/in.h>
-#if defined(__GLIBC__) && __GLIBC__ >=2 && __GLIBC_MINOR__ >= 1
-#include <netpacket/packet.h>
-#include <net/ethernet.h>
-#else
-#include <sys/types.h>
-#include <netinet/if_ether.h>
+#ifdef HAVE_NET_ETHERNET_H
+# include <net/ethernet.h>
#endif
#endif
-#include "libbb.h"
-#include "inet_common.h"
#if ENABLE_FEATURE_IFCONFIG_SLIP
# include <net/if_slip.h>
#if ENABLE_FEATURE_IFCONFIG_SLIP
# include <net/if_slip.h>