diff options
| author | phk <phk@FreeBSD.org> | 1994-09-16 05:47:06 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1994-09-16 05:47:06 +0000 |
| commit | b9bdf5a8d6d7e6ae615d97942a7480c02a5e6d30 (patch) | |
| tree | b92a7f95b81824000a4873c75940affa1d511728 | |
| parent | ae5f9a40b7e38e45dd0788a9ec66d80d71e83989 (diff) | |
| download | FreeBSD-src-b9bdf5a8d6d7e6ae615d97942a7480c02a5e6d30.zip FreeBSD-src-b9bdf5a8d6d7e6ae615d97942a7480c02a5e6d30.tar.gz | |
Made the kernel compile even without "ether".
| -rw-r--r-- | sys/amd64/amd64/machdep.c | 5 | ||||
| -rw-r--r-- | sys/i386/i386/machdep.c | 5 | ||||
| -rw-r--r-- | sys/net/if.c | 5 | ||||
| -rw-r--r-- | sys/netinet/in.c | 5 |
4 files changed, 16 insertions, 4 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 9fec7cb..6034903 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.63 1994/09/15 10:52:46 davidg Exp $ + * $Id: machdep.c,v 1.64 1994/09/16 01:00:38 ache Exp $ */ #include "npx.h" @@ -93,6 +93,7 @@ extern vm_offset_t avail_start, avail_end; #include <i386/isa/isa.h> #include <i386/isa/rtc.h> +#include <ether.h> static void identifycpu(void); static void initcpu(void); @@ -199,7 +200,9 @@ cpu_startup() */ #define DONET(isr, n) do { extern void isr(void); netisrs[n] = isr; } while(0) #ifdef INET +#if NETHER > 0 DONET(arpintr, NETISR_ARP); +#endif DONET(ipintr, NETISR_IP); #endif #ifdef NS diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 9fec7cb..6034903 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.63 1994/09/15 10:52:46 davidg Exp $ + * $Id: machdep.c,v 1.64 1994/09/16 01:00:38 ache Exp $ */ #include "npx.h" @@ -93,6 +93,7 @@ extern vm_offset_t avail_start, avail_end; #include <i386/isa/isa.h> #include <i386/isa/rtc.h> +#include <ether.h> static void identifycpu(void); static void initcpu(void); @@ -199,7 +200,9 @@ cpu_startup() */ #define DONET(isr, n) do { extern void isr(void); netisrs[n] = isr; } while(0) #ifdef INET +#if NETHER > 0 DONET(arpintr, NETISR_ARP); +#endif DONET(ipintr, NETISR_IP); #endif #ifdef NS diff --git a/sys/net/if.c b/sys/net/if.c index 02741d0..6507bf5 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.3 (Berkeley) 1/4/94 - * $Id: if.c,v 1.5 1994/08/08 11:43:44 davidg Exp $ + * $Id: if.c,v 1.6 1994/08/18 22:35:19 wollman Exp $ */ #include <sys/param.h> @@ -47,6 +47,7 @@ #include <net/if.h> #include <net/if_dl.h> #include <net/if_types.h> +#include <ether.h> int ifqmaxlen = IFQ_MAXLEN; @@ -156,8 +157,10 @@ if_attach(ifp) sdl->sdl_data[--namelen] = 0xff; } /* XXX -- Temporary fix before changing 10 ethernet drivers */ +#if NETHER > 0 if (ifp->if_output == ether_output) ether_ifattach(ifp); +#endif } /* * Locate an interface based on a complete address. diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 05bd4ca..57a0bb3 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in.c 8.2 (Berkeley) 11/15/93 - * $Id: in.c,v 1.3 1994/08/02 07:48:12 davidg Exp $ + * $Id: in.c,v 1.4 1994/08/18 22:35:28 wollman Exp $ */ #include <sys/param.h> @@ -49,6 +49,7 @@ #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet/if_ether.h> +#include <ether.h> #ifdef INET /* @@ -424,10 +425,12 @@ in_ifinit(ifp, ia, sin, scrub) ia->ia_addr = oldaddr; return (error); } +#if NETHER > 0 if (ifp->if_output == ether_output) { /* XXX: Another Kludge */ ia->ia_ifa.ifa_rtrequest = arp_rtrequest; ia->ia_ifa.ifa_flags |= RTF_CLONING; } +#endif splx(s); if (scrub) { ia->ia_ifa.ifa_addr = (struct sockaddr *)&oldaddr; |
