Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-02-06 13:30:24 +00:00
Code Issues Projects Releases Wiki Activity

Patch from Robert P. Day to remove #ifdefed out SLIP support code that we

Browse Source 
have no CONFIG option to enable, and which existing SLIP users don't seem
to miss.
This commit is contained in:
Rob Landley 2006-05-19 22:54:42 +00:00
parent 206f75784b
commit 9b5a99ad21
1 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
networking/interface.c
View File

@ -52,7 +52,6 @@
*/ */
#define HAVE_HWETHER 1 #define HAVE_HWETHER 1
#define HAVE_HWPPP 1 #define HAVE_HWPPP 1
#undef HAVE_HWSLIP
#include "inet_common.h" #include "inet_common.h"
@ -79,10 +78,6 @@
#define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6" #define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6"
#define new(p) ((p) = xcalloc(1,sizeof(*(p)))) #define new(p) ((p) = xcalloc(1,sizeof(*(p))))
#ifdef HAVE_HWSLIP
#include <net/if_slip.h>
#endif
#if HAVE_AFINET6 #if HAVE_AFINET6
#ifndef _LINUX_IN6_H #ifndef _LINUX_IN6_H
@ -1061,27 +1056,6 @@ static int if_fetch(struct interface *ife)
else else
ife->mtu = ifr.ifr_mtu; 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 #ifdef SIOCGIFMAP
strcpy(ifr.ifr_name, ifname); strcpy(ifr.ifr_name, ifname);
if (ioctl(skfd, SIOCGIFMAP, &ifr) == 0) if (ioctl(skfd, SIOCGIFMAP, &ifr) == 0)
@ -1308,13 +1282,6 @@ static const struct hwtype * const hwtypes[] = {
&loop_hwtype, &loop_hwtype,
#if HAVE_HWSLIP
&slip_hwtype,
&cslip_hwtype,
&slip6_hwtype,
&cslip6_hwtype,
&adaptive_hwtype,
#endif
#if HAVE_HWSTRIP #if HAVE_HWSTRIP
&strip_hwtype, &strip_hwtype,
#endif #endif
@ -1338,13 +1305,6 @@ static void hwinit()
{ {
loop_hwtype.title = _("Local Loopback"); loop_hwtype.title = _("Local Loopback");
unspec_hwtype.title = _("UNSPEC"); 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 #if HAVE_HWETHER
ether_hwtype.title = _("Ethernet"); ether_hwtype.title = _("Ethernet");
#endif #endif