[BusyBox-cvs] svn commit: trunk/busybox: include networking

[landley at busybox.net]

Author: landley
Date: 2005-05-03 16:30:08 -0600 (Tue, 03 May 2005)
New Revision: 10242

Log:
From: Shaun Jackman <sjackman at gmail.com>
To: busybox at 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.
  


Modified:
   trunk/busybox/include/inet_common.h
   trunk/busybox/networking/ifconfig.c


Changeset:
Modified: trunk/busybox/include/inet_common.h
===================================================================
--- trunk/busybox/include/inet_common.h	2005-05-03 21:30:26 UTC (rev 10241)
+++ trunk/busybox/include/inet_common.h	2005-05-03 22:30:08 UTC (rev 10242)
@@ -29,5 +29,7 @@
 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

Modified: trunk/busybox/networking/ifconfig.c
===================================================================
--- trunk/busybox/networking/ifconfig.c	2005-05-03 21:30:26 UTC (rev 10241)
+++ trunk/busybox/networking/ifconfig.c	2005-05-03 22:30:08 UTC (rev 10242)
@@ -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 arg1opt {
 	const char *name;
-	unsigned short selector;
+	int selector;
 	unsigned short ifr_offset;
 };