diff options
| author | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2005-05-03 22:30:08 +0000 |
|---|---|---|
| committer | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2005-05-03 22:30:08 +0000 |
| commit | b29f49f0e1de8dd5dc1fb77af23035ede9303926 (patch) | |
| tree | 37e74599154c1bfe7e62a973e9587c24dfa860c4 | |
| parent | 625bb93348c201a17cfe7f87e19ea519ad444737 (diff) | |
| download | busybox-w32-b29f49f0e1de8dd5dc1fb77af23035ede9303926.tar.gz busybox-w32-b29f49f0e1de8dd5dc1fb77af23035ede9303926.tar.bz2 busybox-w32-b29f49f0e1de8dd5dc1fb77af23035ede9303926.zip | |
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.
git-svn-id: svn://busybox.net/trunk/busybox@10242 69ca8d6d-28ef-0310-b511-8ec308f3f277
| -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 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 | |||
| 29 | extern int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in, | 29 | extern int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in, |
| 30 | int numeric, unsigned int netmask); | 30 | int numeric, unsigned int netmask); |
| 31 | 31 | ||
| 32 | #ifdef CONFIG_FEATURE_IPV6 | ||
| 32 | extern int INET6_resolve(const char *name, struct sockaddr_in6 *sin6); | 33 | extern int INET6_resolve(const char *name, struct sockaddr_in6 *sin6); |
| 33 | extern int INET6_rresolve(char *name, size_t len, struct sockaddr_in6 *sin6, int numeric); | 34 | extern int INET6_rresolve(char *name, size_t len, struct sockaddr_in6 *sin6, int numeric); |
| 35 | #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 @@ | |||
| 46 | #include <netpacket/packet.h> | 46 | #include <netpacket/packet.h> |
| 47 | #include <net/ethernet.h> | 47 | #include <net/ethernet.h> |
| 48 | #else | 48 | #else |
| 49 | #include <asm/types.h> | 49 | #include <sys/types.h> |
| 50 | #include <linux/if_ether.h> | 50 | #include <netinet/if_ether.h> |
| 51 | #endif | 51 | #endif |
| 52 | #include "inet_common.h" | 52 | #include "inet_common.h" |
| 53 | #include "busybox.h" | 53 | #include "busybox.h" |
| @@ -177,7 +177,7 @@ struct in6_ifreq { | |||
| 177 | 177 | ||
| 178 | struct arg1opt { | 178 | struct arg1opt { |
| 179 | const char *name; | 179 | const char *name; |
| 180 | unsigned short selector; | 180 | int selector; |
| 181 | unsigned short ifr_offset; | 181 | unsigned short ifr_offset; |
| 182 | }; | 182 | }; |
| 183 | 183 | ||