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.
This commit is contained in:
parent
93983040c5
commit
0d38301d85
@ -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
|
||||
|
@ -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;
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user