From: Rob Landley <rob@landley.net>
Date: Tue, 3 May 2005 22:30:08 +0000 (-0000)
Subject: From: Shaun Jackman <sjackman@gmail.com>
X-Git-Tag: 1_1_0~1018
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0d38301d851f29e1f64db1c0759c7fb97c59347e;p=oweals%2Fbusybox.git

From: Shaun Jackman <sjackman@gmail.com>
To: busybox@mail.codepoet.org

Wrap sockaddr_in6 in a ifdef CONFIG_FEATURE_IPV6.
Include sys/types.h instead of asm/types.h.
Include netinet/if_ether.h instead of linux/if_ether.h
The ioctl request argument is an int, not an unsigned short.
---

diff --git a/include/inet_common.h b/include/inet_common.h
index afea5deaa..4a9c3a2d7 100644
--- a/include/inet_common.h
+++ b/include/inet_common.h
@@ -29,5 +29,7 @@ extern int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirs
 extern int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
 			 int numeric, unsigned int netmask);
 
+#ifdef CONFIG_FEATURE_IPV6
 extern int INET6_resolve(const char *name, struct sockaddr_in6 *sin6);
 extern int INET6_rresolve(char *name, size_t len, struct sockaddr_in6 *sin6, int numeric);
+#endif
diff --git a/networking/ifconfig.c b/networking/ifconfig.c
index 4e3df2982..fc7798f2d 100644
--- a/networking/ifconfig.c
+++ b/networking/ifconfig.c
@@ -46,8 +46,8 @@
 #include <netpacket/packet.h>
 #include <net/ethernet.h>
 #else
-#include <asm/types.h>
-#include <linux/if_ether.h>
+#include <sys/types.h>
+#include <netinet/if_ether.h>
 #endif
 #include "inet_common.h"
 #include "busybox.h"
@@ -177,7 +177,7 @@ struct in6_ifreq {
 
 struct arg1opt {
 	const char *name;
-	unsigned short selector;
+	int selector;
 	unsigned short ifr_offset;
 };