[PATCH] remove HWSLIP-related cruft from networking/interface.c

[Robert P. J. Day]

  i have no clue what the HWSLIP stuff was all about, but andy green
seems to think it's superfluous so this gets rid of it.  i can verify
the build still works, someone else (andy? :-) is welcome to check if
SLIP still works properly once it's applied.

rday
-------------- next part --------------
diff -pru busybox/networking/interface.c busybox.new/networking/interface.c
--- busybox/networking/interface.c	2006-05-11 08:04:07.000000000 -0400
+++ busybox.new/networking/interface.c	2006-05-18 16:37:25.000000000 -0400
@@ -52,7 +52,6 @@
  */
 #define HAVE_HWETHER	1
 #define HAVE_HWPPP	1
-#undef HAVE_HWSLIP
 
 
 #include "inet_common.h"
@@ -80,10 +79,6 @@
 #define new(p) ((p) = xcalloc(1,sizeof(*(p))))
 #define KRELEASE(maj,min,patch) ((maj) * 65536 + (min)*256 + (patch))
 
-#ifdef HAVE_HWSLIP
-#include <net/if_slip.h>
-#endif
-
 #if HAVE_AFINET6
 
 #ifndef _LINUX_IN6_H
@@ -1062,27 +1057,6 @@ static int if_fetch(struct interface *if
 	else
 		ife->mtu = ifr.ifr_mtu;
 
-#ifdef HAVE_HWSLIP
-	if (ife->type == ARPHRD_SLIP || ife->type == ARPHRD_CSLIP ||
-		ife->type == ARPHRD_SLIP6 || ife->type == ARPHRD_CSLIP6 ||
-		ife->type == ARPHRD_ADAPT) {
-#ifdef SIOCGOUTFILL
-		strcpy(ifr.ifr_name, ifname);
-		if (ioctl(skfd, SIOCGOUTFILL, &ifr) < 0)
-			ife->outfill = 0;
-		else
-			ife->outfill = (unsigned int) ifr.ifr_data;
-#endif
-#ifdef SIOCGKEEPALIVE
-		strcpy(ifr.ifr_name, ifname);
-		if (ioctl(skfd, SIOCGKEEPALIVE, &ifr) < 0)
-			ife->keepalive = 0;
-		else
-			ife->keepalive = (unsigned int) ifr.ifr_data;
-#endif
-	}
-#endif
-
 #ifdef SIOCGIFMAP
 	strcpy(ifr.ifr_name, ifname);
 	if (ioctl(skfd, SIOCGIFMAP, &ifr) == 0)
@@ -1309,13 +1283,6 @@ static const struct hwtype * const hwtyp
 
 	&loop_hwtype,
 
-#if HAVE_HWSLIP
-	&slip_hwtype,
-	&cslip_hwtype,
-	&slip6_hwtype,
-	&cslip6_hwtype,
-	&adaptive_hwtype,
-#endif
 #if HAVE_HWSTRIP
 	&strip_hwtype,
 #endif
@@ -1339,13 +1306,6 @@ static void hwinit()
 {
 	loop_hwtype.title = _("Local Loopback");
 	unspec_hwtype.title = _("UNSPEC");
-#if HAVE_HWSLIP
-	slip_hwtype.title = _("Serial Line IP");
-	cslip_hwtype.title = _("VJ Serial Line IP");
-	slip6_hwtype.title = _("6-bit Serial Line IP");
-	cslip6_hwtype.title = _("VJ 6-bit Serial Line IP");
-	adaptive_hwtype.title = _("Adaptive Serial Line IP");
-#endif
 #if HAVE_HWETHER
 	ether_hwtype.title = _("Ethernet");
 #endif