diff options
| author | Rob Landley | 2005-05-03 22:30:08 +0000 |
|---|---|---|
| committer | Rob Landley | 2005-05-03 22:30:08 +0000 |
| commit | 0d38301d851f29e1f64db1c0759c7fb97c59347e (patch) | |
| tree | 37e74599154c1bfe7e62a973e9587c24dfa860c4 | |
| parent | 93983040c51ccbb2a19fc53f50498148edf98f65 (diff) | |
| download | busybox-0d38301d851f29e1f64db1c0759c7fb97c59347e.zip busybox-0d38301d851f29e1f64db1c0759c7fb97c59347e.tar.gz | |
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.
| -rw-r--r-- | include/inet_common.h | 2 | ||||
| -rw-r--r-- | networking/ifconfig.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/inet_common.h b/include/inet_common.h index afea5de..4a9c3a2 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 4e3df29..fc7798f 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; }; |