diff options
| author | Rob Landley <rob@landley.net> | 2006-05-19 22:54:42 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-05-19 22:54:42 +0000 |
| commit | 9b5a99ad2109abdb0fcf7303a57c20500dad3e9c (patch) | |
| tree | db8feec690a45a7065258bfcdffbafbd4e905689 | |
| parent | 206f75784b8e87e44b16be733be1d79e55c38ea8 (diff) | |
| download | busybox-w32-9b5a99ad2109abdb0fcf7303a57c20500dad3e9c.tar.gz busybox-w32-9b5a99ad2109abdb0fcf7303a57c20500dad3e9c.tar.bz2 busybox-w32-9b5a99ad2109abdb0fcf7303a57c20500dad3e9c.zip | |
Patch from Robert P. Day to remove #ifdefed out SLIP support code that we
have no CONFIG option to enable, and which existing SLIP users don't seem
to miss.
| -rw-r--r-- | networking/interface.c | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/networking/interface.c b/networking/interface.c index 878452236..d97b0422e 100644 --- a/networking/interface.c +++ b/networking/interface.c | |||
| @@ -52,7 +52,6 @@ | |||
| 52 | */ | 52 | */ |
| 53 | #define HAVE_HWETHER 1 | 53 | #define HAVE_HWETHER 1 |
| 54 | #define HAVE_HWPPP 1 | 54 | #define HAVE_HWPPP 1 |
| 55 | #undef HAVE_HWSLIP | ||
| 56 | 55 | ||
| 57 | 56 | ||
| 58 | #include "inet_common.h" | 57 | #include "inet_common.h" |
| @@ -79,10 +78,6 @@ | |||
| 79 | #define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6" | 78 | #define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6" |
| 80 | #define new(p) ((p) = xcalloc(1,sizeof(*(p)))) | 79 | #define new(p) ((p) = xcalloc(1,sizeof(*(p)))) |
| 81 | 80 | ||
| 82 | #ifdef HAVE_HWSLIP | ||
| 83 | #include <net/if_slip.h> | ||
| 84 | #endif | ||
| 85 | |||
| 86 | #if HAVE_AFINET6 | 81 | #if HAVE_AFINET6 |
| 87 | 82 | ||
| 88 | #ifndef _LINUX_IN6_H | 83 | #ifndef _LINUX_IN6_H |
| @@ -1061,27 +1056,6 @@ static int if_fetch(struct interface *ife) | |||
| 1061 | else | 1056 | else |
| 1062 | ife->mtu = ifr.ifr_mtu; | 1057 | ife->mtu = ifr.ifr_mtu; |
| 1063 | 1058 | ||
| 1064 | #ifdef HAVE_HWSLIP | ||
| 1065 | if (ife->type == ARPHRD_SLIP || ife->type == ARPHRD_CSLIP || | ||
| 1066 | ife->type == ARPHRD_SLIP6 || ife->type == ARPHRD_CSLIP6 || | ||
| 1067 | ife->type == ARPHRD_ADAPT) { | ||
| 1068 | #ifdef SIOCGOUTFILL | ||
| 1069 | strcpy(ifr.ifr_name, ifname); | ||
| 1070 | if (ioctl(skfd, SIOCGOUTFILL, &ifr) < 0) | ||
| 1071 | ife->outfill = 0; | ||
| 1072 | else | ||
| 1073 | ife->outfill = (unsigned int) ifr.ifr_data; | ||
| 1074 | #endif | ||
| 1075 | #ifdef SIOCGKEEPALIVE | ||
| 1076 | strcpy(ifr.ifr_name, ifname); | ||
| 1077 | if (ioctl(skfd, SIOCGKEEPALIVE, &ifr) < 0) | ||
| 1078 | ife->keepalive = 0; | ||
| 1079 | else | ||
| 1080 | ife->keepalive = (unsigned int) ifr.ifr_data; | ||
| 1081 | #endif | ||
| 1082 | } | ||
| 1083 | #endif | ||
| 1084 | |||
| 1085 | #ifdef SIOCGIFMAP | 1059 | #ifdef SIOCGIFMAP |
| 1086 | strcpy(ifr.ifr_name, ifname); | 1060 | strcpy(ifr.ifr_name, ifname); |
| 1087 | if (ioctl(skfd, SIOCGIFMAP, &ifr) == 0) | 1061 | if (ioctl(skfd, SIOCGIFMAP, &ifr) == 0) |
| @@ -1308,13 +1282,6 @@ static const struct hwtype * const hwtypes[] = { | |||
| 1308 | 1282 | ||
| 1309 | &loop_hwtype, | 1283 | &loop_hwtype, |
| 1310 | 1284 | ||
| 1311 | #if HAVE_HWSLIP | ||
| 1312 | &slip_hwtype, | ||
| 1313 | &cslip_hwtype, | ||
| 1314 | &slip6_hwtype, | ||
| 1315 | &cslip6_hwtype, | ||
| 1316 | &adaptive_hwtype, | ||
| 1317 | #endif | ||
| 1318 | #if HAVE_HWSTRIP | 1285 | #if HAVE_HWSTRIP |
| 1319 | &strip_hwtype, | 1286 | &strip_hwtype, |
| 1320 | #endif | 1287 | #endif |
| @@ -1338,13 +1305,6 @@ static void hwinit() | |||
| 1338 | { | 1305 | { |
| 1339 | loop_hwtype.title = _("Local Loopback"); | 1306 | loop_hwtype.title = _("Local Loopback"); |
| 1340 | unspec_hwtype.title = _("UNSPEC"); | 1307 | unspec_hwtype.title = _("UNSPEC"); |
| 1341 | #if HAVE_HWSLIP | ||
| 1342 | slip_hwtype.title = _("Serial Line IP"); | ||
| 1343 | cslip_hwtype.title = _("VJ Serial Line IP"); | ||
| 1344 | slip6_hwtype.title = _("6-bit Serial Line IP"); | ||
| 1345 | cslip6_hwtype.title = _("VJ 6-bit Serial Line IP"); | ||
| 1346 | adaptive_hwtype.title = _("Adaptive Serial Line IP"); | ||
| 1347 | #endif | ||
| 1348 | #if HAVE_HWETHER | 1308 | #if HAVE_HWETHER |
| 1349 | ether_hwtype.title = _("Ethernet"); | 1309 | ether_hwtype.title = _("Ethernet"); |
| 1350 | #endif | 1310 | #endif |