d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make INET a proper option.

Browse Source 
This will not make any of object files that LINT create change; there
might be differences with INET disabled, but hardly anything compiled
before without INET anyway.  Now the 'obvious' things will give a
proper error if compiled without inet - ipx_ip, ipfw, tcp_debug.  The
only thing that _should_ work (but can't be made to compile reasonably
easily) is sppp :-(

This commit move struct arpcom from <netinet/if_ether.h> to
<net/if_arp.h>.
This commit is contained in:
Eivind Eklund 1998-01-08 23:42:31 +00:00
parent 89d224d415
commit 1d5e9e2255
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=32350
69 changed files with 316 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/conf/options
View File

@ -1,4 +1,4 @@
# $Id: options,v 1.41 1997/12/16 17:39:55 eivind Exp $
# $Id: options,v 1.42 1997/12/16 23:59:37 eivind Exp $
# Format:
# Option name filename
@ -101,6 +101,7 @@ OPEN_MAX opt_defunct.h
ARP_PROXYALL opt_defunct.h
GATEWAY opt_defunct.h
MROUTING opt_mrouting.h
INET opt_inet.h
IPDIVERT
IPFIREWALL opt_ipfw.h
IPFIREWALL_VERBOSE opt_ipfw.h

8
sys/dev/ar/if_ar.c
View File

@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ar.c,v 1.15 1997/05/19 22:02:47 joerg Exp $
* $Id: if_ar.c,v 1.16 1997/09/02 01:18:04 bde Exp $
*/
/*
@ -73,6 +73,12 @@
#include "ioconf.h"
#include "sppp.h"
#if NSPPP <= 0
#error device 'ar' require sppp.
#endif
#ifdef TRACE
#define TRC(x) x
#else

8
sys/dev/ar/if_ar_isa.c
View File

@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ar.c,v 1.15 1997/05/19 22:02:47 joerg Exp $
* $Id: if_ar.c,v 1.16 1997/09/02 01:18:04 bde Exp $
*/
/*
@ -73,6 +73,12 @@
#include "ioconf.h"
#include "sppp.h"
#if NSPPP <= 0
#error device 'ar' require sppp.
#endif
#ifdef TRACE
#define TRC(x) x
#else

7
sys/dev/de/if_de.c
View File

@ -1,5 +1,5 @@
/* $NetBSD: if_de.c,v 1.56 1997/10/20 14:32:46 matt Exp $ */
/* $Id: if_de.c,v 1.75 1997/11/22 06:45:57 bde Exp $ */
/* $Id: if_de.c,v 1.76 1997/12/15 20:31:25 eivind Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@ -39,6 +39,7 @@
*/
#define TULIP_HDR_DATA
#include "opt_inet.h"
#include "opt_ipx.h"
#include <sys/param.h>
@ -82,6 +83,7 @@
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_ether.h>
#endif
#ifdef IPX
@ -99,7 +101,8 @@
#if defined(__FreeBSD__)
#include <vm/pmap.h>
#include <pci.h>
#include <netinet/if_ether.h>
#include <net/ethernet.h>
#include <net/if_arp.h>
#if NPCI > 0
#include <pci/pcivar.h>
#include <pci/dc21040reg.h>

6
sys/dev/ed/if_ed.c
View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ed.c,v 1.128 1997/11/07 08:52:33 phk Exp $
* $Id: if_ed.c,v 1.129 1997/11/20 15:48:27 nate Exp $
*/
/*
@ -39,6 +39,7 @@
#include "ed.h"
#include "bpfilter.h"
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -49,13 +50,14 @@
#include <sys/socket.h>
#include <sys/syslog.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <net/if_dl.h>
#include <net/if_mib.h>
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_ether.h>
#endif
#ifdef NS

1
sys/dev/en/midway.c
View File

@ -89,6 +89,7 @@
#ifdef __FreeBSD__
#include "en.h"
#include "opt_inet.h"
#endif
#if NEN > 0 || !defined(__FreeBSD__)

8
sys/dev/ep/if_ep.c
View File

@ -38,7 +38,7 @@
*/
/*
* $Id: if_ep.c,v 1.68 1997/11/27 12:59:46 kato Exp $
* $Id: if_ep.c,v 1.69 1997/12/15 20:30:43 eivind Exp $
*
* Promiscuous mode added and interrupt logic slightly changed
* to reduce the number of adapter failures. Transceiver select
@ -60,6 +60,7 @@
#if NEP > 0
#include "bpfilter.h"
#include "opt_inet.h"
#include "opt_ipx.h"
#include <sys/param.h>
@ -78,6 +79,11 @@
#include <net/if.h>
#if defined(__FreeBSD__)
#include <net/ethernet.h>
#include <net/if_arp.h>
#endif
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_ether.h>

5
sys/dev/ex/if_ex.c
View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ex.c,v 1.8 1997/11/07 08:52:38 phk Exp $
* $Id: if_ex.c,v 1.9 1997/12/15 20:30:45 eivind Exp $
*/
/*
@ -38,6 +38,7 @@
#include "ex.h"
#if NEX > 0
#include "bpfilter.h"
#include "opt_inet.h"
#include "opt_ipx.h"
#include <sys/param.h>
@ -47,7 +48,9 @@
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#ifdef INET
#include <netinet/in.h>

5
sys/dev/fe/if_fe.c
View File

@ -21,7 +21,7 @@
*/
/*
* $Id: if_fe.c,v 1.35 1997/11/20 15:48:35 nate Exp $
* $Id: if_fe.c,v 1.36 1997/12/15 20:30:47 eivind Exp $
*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
* To be used with FreeBSD 2.x
@ -72,6 +72,7 @@
#include "fe.h"
#include "bpfilter.h"
#include "opt_inet.h"
#include "opt_ipx.h"
#include <sys/param.h>
@ -85,7 +86,9 @@
#include <sys/socket.h>
#include <sys/syslog.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <net/if_dl.h>
#ifdef INET

7
sys/dev/fxp/if_fxp.c
View File

@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_fxp.c,v 1.45 1997/10/23 01:45:15 davidg Exp $
* $Id: if_fxp.c,v 1.46 1997/10/28 15:59:21 bde Exp $
*/
/*
@ -35,6 +35,7 @@
*/
#include "bpfilter.h"
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -49,6 +50,7 @@
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_ether.h>
#endif
#ifdef NS
@ -94,7 +96,8 @@
#include <sys/sockio.h>
#include <netinet/if_ether.h>
#include <net/ethernet.h>
#include <net/if_arp.h>
#include <vm/vm.h> /* for vtophys */
#include <vm/pmap.h> /* for vtophys */

5
sys/dev/ie/if_ie.c
View File

@ -47,7 +47,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ie.c,v 1.47 1997/10/15 10:09:24 joerg Exp $
* $Id: if_ie.c,v 1.48 1997/12/15 20:30:49 eivind Exp $
*/
/*
@ -108,6 +108,7 @@ iomem and and with 0xffff.
#include "ie.h"
#if NIE > 0
#include "opt_inet.h"
#include "opt_ipx.h"
#include <sys/param.h>
@ -120,7 +121,9 @@ iomem and and with 0xffff.
#include <sys/sockio.h>
#include <sys/syslog.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <net/if_types.h>
#include <net/if_dl.h>

5
sys/dev/lnc/if_lnc.c
View File

@ -65,6 +65,7 @@
#if NLNC > 0
#include "bpfilter.h"
#include "opt_inet.h"
/* Some defines that should really be in generic locations */
#define FCS_LEN 4
@ -79,7 +80,9 @@
#include <sys/socket.h>
#include <sys/syslog.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <net/if_types.h>
#ifdef INET
#include <netinet/in.h>
@ -96,7 +99,7 @@
#include <i386/isa/if_lnc.h>
struct lnc_softc {
struct arpcom arpcom; /* see ../../netinet/if_ether.h */
struct arpcom arpcom; /* see ../../net/if_arp.h */
struct nic_info nic; /* NIC specific info */
int nrdre;
struct host_ring_entry *recv_ring; /* start of alloc'd mem */

6
sys/dev/pdq/if_fea.c
View File

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_fea.c,v 1.6 1997/09/14 11:28:30 peter Exp $
* $Id: if_fea.c,v 1.7 1997/09/21 21:35:24 gibbs Exp $
*/
/*
@ -30,6 +30,7 @@
* This module support the DEFEA EISA FDDI Controller.
*/
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/kernel.h>
@ -38,11 +39,12 @@
#include <sys/device.h>
#endif
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_ether.h>
#endif
#if defined(__FreeBSD__)

5
sys/dev/pdq/if_fpa.c
View File

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_fpa.c,v 1.3 1997/03/24 11:24:51 bde Exp $
* $Id: if_fpa.c,v 1.4 1997/08/02 14:33:10 bde Exp $
*
*/
@ -31,6 +31,7 @@
* This module supports the DEC DEFPA PCI FDDI Controller
*/
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/kernel.h>
@ -48,6 +49,8 @@
#if defined(__FreeBSD__)
#include "fpa.h"
#include <net/ethernet.h>
#include <net/if_arp.h>
#include <pci/pcivar.h>
#include <dev/pdq/pdqvar.h>
#include <dev/pdq/pdqreg.h>

8
sys/dev/pdq/pdq_ifsubr.c
View File

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: pdq_ifsubr.c,v 1.4 1997/03/24 11:32:26 bde Exp $
* $Id: pdq_ifsubr.c,v 1.5 1997/06/14 13:56:07 bde Exp $
*
*/
@ -33,6 +33,8 @@
*/
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/sockio.h>
@ -48,11 +50,13 @@
#include <net/bpf.h>
#endif
#if defined(__FreeBSD__)
#include <net/ethernet.h>
#include <net/if_arp.h>
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_ether.h>
#endif
#if defined(__FreeBSD__)
#include <netinet/if_fddi.h>
#else
#include <net/if_fddi.h>

7
sys/dev/sr/if_sr.c
View File

@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_sr.c,v 1.8 1997/07/20 14:10:01 bde Exp $
* $Id: if_sr.c,v 1.9 1997/09/02 01:18:16 bde Exp $
*/
/*
@ -55,6 +55,11 @@
#endif
#include "bpfilter.h"
#include "sppp.h"
#if NSPPP <= 0
#error Device 'sr' requires sppp.
#endif
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>

7
sys/dev/sr/if_sr_isa.c
View File

@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_sr.c,v 1.8 1997/07/20 14:10:01 bde Exp $
* $Id: if_sr.c,v 1.9 1997/09/02 01:18:16 bde Exp $
*/
/*
@ -55,6 +55,11 @@
#endif
#include "bpfilter.h"
#include "sppp.h"
#if NSPPP <= 0
#error Device 'sr' requires sppp.
#endif
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>

7
sys/dev/vx/if_vx.c
View File

@ -61,6 +61,7 @@
#endif
#include "bpfilter.h"
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -71,10 +72,8 @@
#include <net/if.h>
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_ether.h>
#endif
#include <net/ethernet.h>
#include <net/if_arp.h>
#ifdef NS
#include <netns/ns.h>

5
sys/dev/vx/if_vx_eisa.c
View File

@ -34,16 +34,19 @@
#include "vx.h"
#if NVX > 0
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_ether.h>
#endif
#ifdef NS

4
sys/dev/vx/if_vx_pci.c
View File

@ -33,19 +33,23 @@
#include "vx.h"
#if NVX > 0
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_ether.h>
#endif
#ifdef NS
#include <netns/ns.h>
#include <netns/ns_if.h>

7
sys/dev/wl/if_wl.c
View File

@ -1,4 +1,4 @@
/* $Id: if_wl.c,v 1.8 1997/08/25 22:34:25 bde Exp $ */
/* $Id: if_wl.c,v 1.9 1997/09/21 21:41:13 gibbs Exp $ */
/*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -191,6 +191,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "wl.h"
#include "opt_wavelan.h"
#include "bpfilter.h"
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -203,7 +204,9 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <sys/kernel.h>
#include <sys/sysctl.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <net/if_dl.h>
#ifdef INET
@ -2581,6 +2584,7 @@ void wl_cache_store (int unit, int base, struct ether_header *eh,
* keep multicast only.
*/
#ifdef INET
/* reject if not IP packet
*/
if ( wl_cache_iponly && (ntohs(eh->ether_type) != 0x800)) {
@ -2676,6 +2680,7 @@ void wl_cache_store (int unit, int base, struct ether_header *eh,
signal - silence;
else
sc->w_sigcache[w_insertcache].snr = 0;
#endif /* INET */
}
#endif /* WLCACHE */

6
sys/i386/eisa/if_fea.c
View File

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_fea.c,v 1.6 1997/09/14 11:28:30 peter Exp $
* $Id: if_fea.c,v 1.7 1997/09/21 21:35:24 gibbs Exp $
*/
/*
@ -30,6 +30,7 @@
* This module support the DEFEA EISA FDDI Controller.
*/
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/kernel.h>
@ -38,11 +39,12 @@
#include <sys/device.h>
#endif
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_ether.h>
#endif
#if defined(__FreeBSD__)

5
sys/i386/eisa/if_vx_eisa.c
View File

@ -34,16 +34,19 @@
#include "vx.h"
#if NVX > 0
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_ether.h>
#endif
#ifdef NS

8
sys/i386/isa/if_ar.c
View File

@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ar.c,v 1.15 1997/05/19 22:02:47 joerg Exp $
* $Id: if_ar.c,v 1.16 1997/09/02 01:18:04 bde Exp $
*/
/*
@ -73,6 +73,12 @@
#include "ioconf.h"
#include "sppp.h"
#if NSPPP <= 0
#error device 'ar' require sppp.
#endif
#ifdef TRACE
#define TRC(x) x
#else

5
sys/i386/isa/if_cx.c
View File

@ -21,6 +21,11 @@
#include "cx.h"
#include "bpfilter.h"
#include "sppp.h"
#if NSPPP <= 0
#error The device 'cx' requires sppp.
#endif
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>

6
sys/i386/isa/if_ed.c
View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ed.c,v 1.128 1997/11/07 08:52:33 phk Exp $
* $Id: if_ed.c,v 1.129 1997/11/20 15:48:27 nate Exp $
*/
/*
@ -39,6 +39,7 @@
#include "ed.h"
#include "bpfilter.h"
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -49,13 +50,14 @@
#include <sys/socket.h>
#include <sys/syslog.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <net/if_dl.h>
#include <net/if_mib.h>
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_ether.h>
#endif
#ifdef NS

6
sys/i386/isa/if_eg.c
View File

@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_eg.c,v 1.24 1997/07/20 14:09:57 bde Exp $
* $Id: if_eg.c,v 1.25 1997/09/02 01:18:09 bde Exp $
*
* Support for 3Com 3c505 Etherlink+ card.
*/
@ -38,6 +38,7 @@
*/
#include "eg.h"
#include "bpfilter.h"
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -48,11 +49,12 @@
#include <sys/socket.h>
#include <sys/syslog.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_ether.h>
#endif
#ifdef NS

5
sys/i386/isa/if_el.c
View File

@ -6,7 +6,7 @@
*
* Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
*
* $Id: if_el.c,v 1.31 1997/07/20 14:09:57 bde Exp $
* $Id: if_el.c,v 1.32 1997/12/15 20:30:40 eivind Exp $
*/
/* Except of course for the portions of code lifted from other FreeBSD
* drivers (mainly elread, elget and el_ioctl)
@ -21,6 +21,7 @@
*/
#include "el.h"
#include "bpfilter.h"
#include "opt_inet.h"
#include "opt_ipx.h"
#include <sys/param.h>
@ -31,7 +32,9 @@
#include <sys/socket.h>
#include <sys/syslog.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#ifdef INET
#include <netinet/in.h>

8
sys/i386/isa/if_ep.c
View File

@ -38,7 +38,7 @@
*/
/*
* $Id: if_ep.c,v 1.68 1997/11/27 12:59:46 kato Exp $
* $Id: if_ep.c,v 1.69 1997/12/15 20:30:43 eivind Exp $
*
* Promiscuous mode added and interrupt logic slightly changed
* to reduce the number of adapter failures. Transceiver select
@ -60,6 +60,7 @@
#if NEP > 0
#include "bpfilter.h"
#include "opt_inet.h"
#include "opt_ipx.h"
#include <sys/param.h>
@ -78,6 +79,11 @@
#include <net/if.h>
#if defined(__FreeBSD__)
#include <net/ethernet.h>
#include <net/if_arp.h>
#endif
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_ether.h>

5
sys/i386/isa/if_ex.c
View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ex.c,v 1.8 1997/11/07 08:52:38 phk Exp $
* $Id: if_ex.c,v 1.9 1997/12/15 20:30:45 eivind Exp $
*/
/*
@ -38,6 +38,7 @@
#include "ex.h"
#if NEX > 0
#include "bpfilter.h"
#include "opt_inet.h"
#include "opt_ipx.h"
#include <sys/param.h>
@ -47,7 +48,9 @@
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#ifdef INET
#include <netinet/in.h>

5
sys/i386/isa/if_fe.c
View File

@ -21,7 +21,7 @@
*/
/*
* $Id: if_fe.c,v 1.35 1997/11/20 15:48:35 nate Exp $
* $Id: if_fe.c,v 1.36 1997/12/15 20:30:47 eivind Exp $
*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
* To be used with FreeBSD 2.x
@ -72,6 +72,7 @@
#include "fe.h"
#include "bpfilter.h"
#include "opt_inet.h"
#include "opt_ipx.h"
#include <sys/param.h>
@ -85,7 +86,9 @@
#include <sys/socket.h>
#include <sys/syslog.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <net/if_dl.h>
#ifdef INET

5
sys/i386/isa/if_ie.c
View File

@ -47,7 +47,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ie.c,v 1.47 1997/10/15 10:09:24 joerg Exp $
* $Id: if_ie.c,v 1.48 1997/12/15 20:30:49 eivind Exp $
*/
/*
@ -108,6 +108,7 @@ iomem and and with 0xffff.
#include "ie.h"
#if NIE > 0
#include "opt_inet.h"
#include "opt_ipx.h"
#include <sys/param.h>
@ -120,7 +121,9 @@ iomem and and with 0xffff.
#include <sys/sockio.h>
#include <sys/syslog.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <net/if_types.h>
#include <net/if_dl.h>

5
sys/i386/isa/if_le.c
View File

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_le.c,v 1.41 1997/08/25 22:28:57 bde Exp $
* $Id: if_le.c,v 1.42 1997/12/15 20:30:51 eivind Exp $
*/
/*
@ -37,6 +37,7 @@
#include "le.h"
#if NLE > 0
#include "opt_inet.h"
#include "opt_ipx.h"
#include <sys/param.h>
@ -47,7 +48,9 @@
#include <sys/sockio.h>
#include <sys/malloc.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <net/if_types.h>
#include <net/if_dl.h>

5
sys/i386/isa/if_lnc.c
View File

@ -65,6 +65,7 @@
#if NLNC > 0
#include "bpfilter.h"
#include "opt_inet.h"
/* Some defines that should really be in generic locations */
#define FCS_LEN 4
@ -79,7 +80,9 @@
#include <sys/socket.h>
#include <sys/syslog.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <net/if_types.h>
#ifdef INET
#include <netinet/in.h>
@ -96,7 +99,7 @@
#include <i386/isa/if_lnc.h>
struct lnc_softc {
struct arpcom arpcom; /* see ../../netinet/if_ether.h */
struct arpcom arpcom; /* see ../../net/if_arp.h */
struct nic_info nic; /* NIC specific info */
int nrdre;
struct host_ring_entry *recv_ring; /* start of alloc'd mem */

7
sys/i386/isa/if_sr.c
View File

@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_sr.c,v 1.8 1997/07/20 14:10:01 bde Exp $
* $Id: if_sr.c,v 1.9 1997/09/02 01:18:16 bde Exp $
*/
/*
@ -55,6 +55,11 @@
#endif
#include "bpfilter.h"
#include "sppp.h"
#if NSPPP <= 0
#error Device 'sr' requires sppp.
#endif
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>

7
sys/i386/isa/if_wl.c
View File

@ -1,4 +1,4 @@
/* $Id: if_wl.c,v 1.8 1997/08/25 22:34:25 bde Exp $ */
/* $Id: if_wl.c,v 1.9 1997/09/21 21:41:13 gibbs Exp $ */
/*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -191,6 +191,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "wl.h"
#include "opt_wavelan.h"
#include "bpfilter.h"
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -203,7 +204,9 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <sys/kernel.h>
#include <sys/sysctl.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <net/if_dl.h>
#ifdef INET
@ -2581,6 +2584,7 @@ void wl_cache_store (int unit, int base, struct ether_header *eh,
* keep multicast only.
*/
#ifdef INET
/* reject if not IP packet
*/
if ( wl_cache_iponly && (ntohs(eh->ether_type) != 0x800)) {
@ -2676,6 +2680,7 @@ void wl_cache_store (int unit, int base, struct ether_header *eh,
signal - silence;
else
sc->w_sigcache[w_insertcache].snr = 0;
#endif /* INET */
}
#endif /* WLCACHE */

5
sys/i386/isa/if_ze.c
View File

@ -47,7 +47,7 @@
*/
/*
* $Id: if_ze.c,v 1.46 1997/10/26 04:36:14 nate Exp $
* $Id: if_ze.c,v 1.47 1997/12/15 20:30:54 eivind Exp $
*/
/* XXX - Don't mix different PCCARD support code */
@ -64,6 +64,7 @@
#include "ze.h"
#if NZE > 0
#include "bpfilter.h"
#include "opt_inet.h"
#include "opt_ipx.h"
#include <sys/param.h>
@ -74,7 +75,9 @@
#include <sys/socket.h>
#include <sys/syslog.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#ifdef INET
#include <netinet/in.h>

5
sys/i386/isa/if_zp.c
View File

@ -34,7 +34,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
* $Id: if_zp.c,v 1.41 1997/11/07 09:20:28 phk Exp $
* $Id: if_zp.c,v 1.42 1997/12/15 20:30:56 eivind Exp $
*/
/*-
* TODO:
@ -114,6 +114,7 @@
#include "zp.h"
#include "bpfilter.h"
#include "opt_inet.h"
#include "opt_ipx.h"
#include <sys/param.h>
@ -126,7 +127,9 @@
#include <sys/sockio.h>
#include <sys/syslog.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#ifdef INET
#include <netinet/in.h>

3
sys/i386/isa/lpt.c
View File

@ -46,7 +46,7 @@
* SUCH DAMAGE.
*
* from: unknown origin, 386BSD 0.1
* $Id: lpt.c,v 1.62 1997/09/02 01:18:18 bde Exp $
* $Id: lpt.c,v 1.63 1997/12/02 21:06:24 phk Exp $
*/
/*
@ -102,6 +102,7 @@
*/
#include "lpt.h"
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>

20
sys/net/if_arp.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)if_arp.h 8.1 (Berkeley) 6/10/93
* $Id$
* $Id: if_arp.h,v 1.8 1997/02/22 09:40:59 peter Exp $
*/
#ifndef _NET_IF_ARP_H_
@ -88,4 +88,22 @@ struct arpreq {
#define ATF_PUBL 0x08 /* publish entry (respond for other host) */
#define ATF_USETRAILERS 0x10 /* has requested trailers */
/*
* Structure shared between the ethernet driver modules and
* the address resolution code. For example, each ec_softc or il_softc
* begins with this structure.
*/
struct arpcom {
/*
* The ifnet struct _must_ be at the head of this structure.
*/
struct ifnet ac_if; /* network-visible interface */
u_char ac_enaddr[ETHER_ADDR_LEN]; /* ethernet hardware address */
int ac_multicnt; /* length of ac_multiaddrs list */
};
#ifdef KERNEL
extern u_char etherbroadcastaddr[ETHER_ADDR_LEN];
#endif
#endif /* !_NET_IF_ARP_H_ */

2
sys/net/if_atmsubr.c
View File

@ -36,6 +36,8 @@
* if_atmsubr.c
*/
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>

3
sys/net/if_disc.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* From: @(#)if_loop.c 8.1 (Berkeley) 6/10/93
* $Id: if_disc.c,v 1.17 1997/03/24 11:33:10 bde Exp $
* $Id: if_disc.c,v 1.18 1997/08/02 14:32:36 bde Exp $
*/
/*
@ -52,6 +52,7 @@
#include <net/bpf.h>
#include "bpfilter.h"
#include "opt_inet.h"
#ifdef TINY_DSMTU
#define DSMTU (1024+512)

8
sys/net/if_ethersubr.c
View File

@ -31,9 +31,10 @@
* SUCH DAMAGE.
*
* @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93
* $Id: if_ethersubr.c,v 1.40 1997/12/15 20:30:59 eivind Exp $
* $Id: if_ethersubr.c,v 1.41 1997/12/20 00:07:02 bde Exp $
*/
#include "opt_inet.h"
#include "opt_ipx.h"
#include <sys/param.h>
@ -52,11 +53,14 @@
#include <net/if_dl.h>
#include <net/if_types.h>
#include <net/ethernet.h>
#include <net/if_arp.h>
#ifdef INET
#include <netinet/in.h>
#include <netinet/in_var.h>
#endif
#include <netinet/if_ether.h>
#endif
#ifdef IPX
#include <netipx/ipx.h>

7
sys/net/if_fddisubr.c
View File

@ -33,9 +33,10 @@
* SUCH DAMAGE.
*
* from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp
* $Id: if_fddisubr.c,v 1.22 1997/11/18 13:37:56 bde Exp $
* $Id: if_fddisubr.c,v 1.23 1997/12/15 20:31:01 eivind Exp $
*/
#include "opt_inet.h"
#include "opt_ipx.h"
#include <sys/param.h>
@ -54,8 +55,10 @@
#ifdef INET
#include <netinet/in.h>
#include <netinet/in_var.h>
#endif
#include <netinet/if_ether.h>
#endif
#include <net/ethernet.h> /* XXX We probably should be able to drop this */
#include <net/if_arp.h>
#if defined(__FreeBSD__)
#include <netinet/if_fddi.h>
#else

3
sys/net/if_loop.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)if_loop.c 8.1 (Berkeley) 6/10/93
* $Id: if_loop.c,v 1.27 1997/08/02 14:32:37 bde Exp $
* $Id: if_loop.c,v 1.28 1997/12/15 20:31:02 eivind Exp $
*/
/*
@ -40,6 +40,7 @@
#include "loop.h"
#if NLOOP > 0
#include "opt_inet.h"
#include "opt_ipx.h"
#include <sys/param.h>

7
sys/net/if_ppp.c
View File

@ -69,17 +69,20 @@
* Paul Mackerras (paulus@cs.anu.edu.au).
*/
/* $Id: if_ppp.c,v 1.51 1997/12/06 13:24:25 bde Exp $ */
/* $Id: if_ppp.c,v 1.52 1997/12/15 20:31:04 eivind Exp $ */
/* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
/* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */
#include "ppp.h"
#if NPPP > 0
#include "opt_ppp.h"
#include "opt_inet.h"
#include "opt_ipx.h"
#include "opt_ppp.h"
#ifdef INET
#define VJC
#endif
#define PPP_COMPRESS
#include <sys/param.h>

5
sys/net/if_sl.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)if_sl.c 8.6 (Berkeley) 2/1/94
* $Id: if_sl.c,v 1.62 1997/12/06 13:24:31 bde Exp $
* $Id: if_sl.c,v 1.64 1997/12/19 19:39:01 ache Exp $
*/
/*
@ -69,6 +69,7 @@
#if NSL > 0
#include "bpfilter.h"
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -95,7 +96,7 @@
#include <netinet/in_var.h>
#include <netinet/ip.h>
#else
Huh? Slip without inet?
#error "Huh? Slip without inet?"
#endif
#include <net/slcompress.h>

5
sys/net/if_spppsubr.c
View File

@ -17,9 +17,10 @@
*
* From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
*
* $Id: if_spppsubr.c,v 1.29 1997/12/15 20:31:08 eivind Exp $
* $Id: if_spppsubr.c,v 1.30 1998/01/01 21:27:18 gj Exp $
*/
#include "opt_inet.h"
#include "opt_ipx.h"
#include <sys/param.h>
@ -45,6 +46,8 @@
#include <netinet/ip.h>
#include <netinet/tcp.h>
#include <netinet/if_ether.h>
#else
#error Huh? sppp without INET?
#endif
#ifdef IPX

10
sys/net/if_tun.c
View File

@ -17,6 +17,8 @@
#include "tun.h"
#if NTUN > 0
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/systm.h>
@ -233,7 +235,8 @@ tuninit(unit)
microtime(&ifp->if_lastchange);
for (ifa = ifp->if_addrhead.tqh_first; ifa;
ifa = ifa->ifa_link.tqe_next)
ifa = ifa->ifa_link.tqe_next) {
#ifdef INET
if (ifa->ifa_addr->sa_family == AF_INET) {
struct sockaddr_in *si;
@ -245,7 +248,8 @@ tuninit(unit)
if (si && si->sin_addr.s_addr)
tp->tun_flags |= TUN_DSTADDR;
}
#endif
}
return 0;
}
@ -574,6 +578,7 @@ tunwrite(dev, uio, flag)
}
#endif
#ifdef INET
s = splimp();
if (IF_QFULL (&ipintrq)) {
IF_DROP(&ipintrq);
@ -587,6 +592,7 @@ tunwrite(dev, uio, flag)
ifp->if_ibytes += tlen;
ifp->if_ipackets++;
schednetisr(NETISR_IP);
#endif
return error;
}

3
sys/net/route.c
View File

@ -31,9 +31,10 @@
* SUCH DAMAGE.
*
* @(#)route.c 8.2 (Berkeley) 11/15/93
* $Id: route.c,v 1.44 1997/09/16 11:43:46 bde Exp $
* $Id: route.c,v 1.45 1997/10/28 15:58:35 bde Exp $
*/
#include "opt_inet.h"
#include "opt_mrouting.h"
#include <sys/param.h>

2
sys/netatalk/at_extern.h
View File

@ -1,5 +1,5 @@
#ifdef _NETINET_IF_ETHER_H_
#ifdef _NET_IF_ARP_H_
extern timeout_t aarpprobe;
extern int aarpresolve __P((struct arpcom *,
struct mbuf *,

2
sys/netinet/if_atm.c
View File

@ -36,6 +36,8 @@
* IP <=> ATM address resolution.
*/
#include "opt_inet.h"
#ifdef INET
#include <sys/param.h>

13
sys/netinet/if_ether.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)if_ether.c 8.1 (Berkeley) 6/10/93
* $Id: if_ether.c,v 1.41 1997/10/28 15:58:40 bde Exp $
* $Id: if_ether.c,v 1.42 1997/12/20 00:07:11 bde Exp $
*/
/*
@ -40,6 +40,8 @@
* add "inuse/lock" bit (or ref. count) along with valid bit
*/
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
@ -108,7 +110,9 @@ static void arptfree __P((struct llinfo_arp *));
static void arptimer __P((void *));
static struct llinfo_arp
*arplookup __P((u_long, int, int));
#ifdef INET
static void in_arpinput __P((struct mbuf *));
#endif
/*
* Timeout routine. Age arp_tab entries periodically.
@ -209,6 +213,7 @@ arp_rtrequest(req, rt, sa)
rt->rt_flags |= RTF_LLINFO;
LIST_INSERT_HEAD(&llinfo_arp, la, la_le);
#ifdef INET
/*
* This keeps the multicast addresses from showing up
* in `arp -a' listings as unresolved. It's not actually
@ -225,6 +230,7 @@ arp_rtrequest(req, rt, sa)
SDL(gate)->sdl_alen = 6;
rt->rt_expire = 0;
}
#endif
if (SIN(rt_key(rt))->sin_addr.s_addr ==
(IA_SIN(rt->rt_ifa))->sin_addr.s_addr) {
@ -406,9 +412,11 @@ arpintr()
switch (ntohs(ar->ar_pro)) {
#ifdef INET
case ETHERTYPE_IP:
in_arpinput(m);
continue;
#endif
}
m_freem(m);
}
@ -416,6 +424,8 @@ arpintr()
NETISR_SET(NETISR_ARP, arpintr);
#ifdef INET
/*
* ARP for Internet protocols on 10 Mb/s Ethernet.
* Algorithm is that given in RFC 826.
@ -566,6 +576,7 @@ in_arpinput(m)
(*ac->ac_if.if_output)(&ac->ac_if, m, &sa, (struct rtentry *)0);
return;
}
#endif
/*
* Free an arp entry.

18
sys/netinet/if_ether.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)if_ether.h 8.3 (Berkeley) 5/2/95
* $Id$
* $Id: if_ether.h,v 1.20 1997/02/22 09:41:25 peter Exp $
*/
#ifndef _NETINET_IF_ETHER_H_
@ -77,21 +77,6 @@ struct ether_arp {
#define arp_pln ea_hdr.ar_pln
#define arp_op ea_hdr.ar_op
/*
* Structure shared between the ethernet driver modules and
* the address resolution code. For example, each ec_softc or il_softc
* begins with this structure.
*/
struct arpcom {
/*
* The ifnet struct _must_ be at the head of this structure.
*/
struct ifnet ac_if; /* network-visible interface */
u_char ac_enaddr[ETHER_ADDR_LEN]; /* ethernet hardware address */
int ac_multicnt; /* length of ac_multiaddrs list */
};
struct sockaddr_inarp {
u_char sin_len;
u_char sin_family;
@ -109,7 +94,6 @@ struct sockaddr_inarp {
#define RTF_ANNOUNCE RTF_PROTO2 /* announce new arp entry */
#ifdef KERNEL
extern u_char etherbroadcastaddr[ETHER_ADDR_LEN];
extern u_char ether_ipmulticast_min[ETHER_ADDR_LEN];
extern u_char ether_ipmulticast_max[ETHER_ADDR_LEN];
extern struct ifqueue arpintrq;

8
sys/netinet/ip_divert.c
View File

@ -30,9 +30,15 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: ip_divert.c,v 1.15 1997/09/14 03:10:39 peter Exp $
* $Id: ip_divert.c,v 1.16 1997/12/18 09:13:34 davidg Exp $
*/
#include "opt_inet.h"
#ifndef INET
#error IPDIVERT requires INET.
#endif
#include <sys/param.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>

6
sys/netinet/ip_fw.c
View File

@ -12,7 +12,7 @@
*
* This software is provided ``AS IS'' without any warranties of any kind.
*
* $Id: ip_fw.c,v 1.71 1998/01/05 00:57:15 alex Exp $
* $Id: ip_fw.c,v 1.72 1998/01/08 03:03:53 alex Exp $
*/
/*
@ -22,6 +22,10 @@
#ifndef IPFIREWALL_MODULE
#include "opt_ipfw.h"
#include "opt_ipdivert.h"
#include "opt_inet.h"
#ifndef INET
#error IPFIREWALL requires INET.
#endif /* INET */
#endif
#include <sys/param.h>

7
sys/netinet/tcp_debug.c
View File

@ -31,11 +31,16 @@
* SUCH DAMAGE.
*
* @(#)tcp_debug.c 8.1 (Berkeley) 6/10/93
* $Id: tcp_debug.c,v 1.10 1997/08/02 14:32:55 bde Exp $
* $Id: tcp_debug.c,v 1.11 1997/09/16 18:36:04 joerg Exp $
*/
#include "opt_inet.h"
#include "opt_tcpdebug.h"
#ifndef INET
#error The option TCPDEBUG requires option INET.
#endif
#ifdef TCPDEBUG
/* load symbolic names */
#define PRUREQUESTS

7
sys/netipx/ipx_ip.c
View File

@ -33,16 +33,21 @@
*
* @(#)ipx_ip.c
*
* $Id: ipx_ip.c,v 1.17 1997/12/15 20:31:13 eivind Exp $
* $Id: ipx_ip.c,v 1.18 1997/12/21 16:35:12 bde Exp $
*/
/*
* Software interface driver for encapsulating IPX in IP.
*/
#include "opt_inet.h"
#include "opt_ipx.h"
#ifdef IPXIP
#ifndef INET
#error The option IPXIP requires option INET.
#endif
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>

3
sys/netipx/spx_debug.c
View File

@ -33,9 +33,10 @@
*
* @(#)spx_debug.c
*
* $Id: spx_debug.c,v 1.10 1997/06/26 19:36:00 jhay Exp $
* $Id: spx_debug.c,v 1.11 1997/10/28 12:24:26 bde Exp $
*/
#include "opt_inet.h"
#include "opt_tcpdebug.h"
#include <sys/param.h>

4
sys/netns/spp_debug.c
View File

@ -31,9 +31,11 @@
* SUCH DAMAGE.
*
* @(#)spp_debug.c 8.1 (Berkeley) 6/10/93
* $Id$
* $Id: spp_debug.c,v 1.8 1997/02/22 09:42:25 peter Exp $
*/
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>

6
sys/nfs/nfs_vnops.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95
* $Id: nfs_vnops.c,v 1.73 1997/12/27 02:56:36 bde Exp $
* $Id: nfs_vnops.c,v 1.74 1997/12/29 00:23:41 dyson Exp $
*/
@ -42,6 +42,8 @@
* vnode op calls for Sun NFS version 2 and 3
*/
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
@ -1343,9 +1345,11 @@ nfs_create(ap)
if (fmode & O_EXCL) {
*tl = txdr_unsigned(NFSV3CREATE_EXCLUSIVE);
nfsm_build(tl, u_long *, NFSX_V3CREATEVERF);
#ifdef INET
if (!TAILQ_EMPTY(&in_ifaddrhead))
*tl++ = IA_SIN(in_ifaddrhead.tqh_first)->sin_addr.s_addr;
else
#endif
*tl++ = create_verf;
*tl = ++create_verf;
} else {

6
sys/nfsclient/nfs_vnops.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95
* $Id: nfs_vnops.c,v 1.73 1997/12/27 02:56:36 bde Exp $
* $Id: nfs_vnops.c,v 1.74 1997/12/29 00:23:41 dyson Exp $
*/
@ -42,6 +42,8 @@
* vnode op calls for Sun NFS version 2 and 3
*/
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
@ -1343,9 +1345,11 @@ nfs_create(ap)
if (fmode & O_EXCL) {
*tl = txdr_unsigned(NFSV3CREATE_EXCLUSIVE);
nfsm_build(tl, u_long *, NFSX_V3CREATEVERF);
#ifdef INET
if (!TAILQ_EMPTY(&in_ifaddrhead))
*tl++ = IA_SIN(in_ifaddrhead.tqh_first)->sin_addr.s_addr;
else
#endif
*tl++ = create_verf;
*tl = ++create_verf;
} else {

3
sys/pc98/pc98/if_ed.c
View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ed.c,v 1.35 1997/11/07 12:53:55 kato Exp $
* $Id: if_ed.c,v 1.36 1997/11/25 09:42:25 kato Exp $
*/
/*
@ -60,6 +60,7 @@
#include "ed.h"
#include "bpfilter.h"
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>

6
sys/pc98/pc98/if_fe.c
View File

@ -21,7 +21,7 @@
*/
/*
* $Id: if_fe.c,v 1.27 1997/11/25 09:42:25 kato Exp $
* $Id: if_fe.c,v 1.28 1997/12/15 20:31:17 eivind Exp $
*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
* To be used with FreeBSD 2.x
@ -75,10 +75,10 @@
* o To test IPX codes.
*/
#include "opt_ipx.h"
#include "fe.h"
#include "bpfilter.h"
#include "opt_inet.h"
#include "opt_ipx.h"
#include <sys/param.h>
#include <sys/kernel.h>

3
sys/pc98/pc98/lpt.c
View File

@ -46,7 +46,7 @@
* SUCH DAMAGE.
*
* from: unknown origin, 386BSD 0.1
* $Id: lpt.c,v 1.14 1997/09/02 10:11:04 kato Exp $
* $Id: lpt.c,v 1.15 1997/12/02 21:06:52 phk Exp $
*/
/*
@ -102,6 +102,7 @@
*/
#include "lpt.h"
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>

7
sys/pci/if_de.c
View File

@ -1,5 +1,5 @@
/* $NetBSD: if_de.c,v 1.56 1997/10/20 14:32:46 matt Exp $ */
/* $Id: if_de.c,v 1.75 1997/11/22 06:45:57 bde Exp $ */
/* $Id: if_de.c,v 1.76 1997/12/15 20:31:25 eivind Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@ -39,6 +39,7 @@
*/
#define TULIP_HDR_DATA
#include "opt_inet.h"
#include "opt_ipx.h"
#include <sys/param.h>
@ -82,6 +83,7 @@
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_ether.h>
#endif
#ifdef IPX
@ -99,7 +101,8 @@
#if defined(__FreeBSD__)
#include <vm/pmap.h>
#include <pci.h>
#include <netinet/if_ether.h>
#include <net/ethernet.h>
#include <net/if_arp.h>
#if NPCI > 0
#include <pci/pcivar.h>
#include <pci/dc21040reg.h>

5
sys/pci/if_fpa.c
View File

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_fpa.c,v 1.3 1997/03/24 11:24:51 bde Exp $
* $Id: if_fpa.c,v 1.4 1997/08/02 14:33:10 bde Exp $
*
*/
@ -31,6 +31,7 @@
* This module supports the DEC DEFPA PCI FDDI Controller
*/
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/kernel.h>
@ -48,6 +49,8 @@
#if defined(__FreeBSD__)
#include "fpa.h"
#include <net/ethernet.h>
#include <net/if_arp.h>
#include <pci/pcivar.h>
#include <dev/pdq/pdqvar.h>
#include <dev/pdq/pdqreg.h>

7
sys/pci/if_fxp.c
View File

@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_fxp.c,v 1.45 1997/10/23 01:45:15 davidg Exp $
* $Id: if_fxp.c,v 1.46 1997/10/28 15:59:21 bde Exp $
*/
/*
@ -35,6 +35,7 @@
*/
#include "bpfilter.h"
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -49,6 +50,7 @@
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_ether.h>
#endif
#ifdef NS
@ -94,7 +96,8 @@
#include <sys/sockio.h>
#include <netinet/if_ether.h>
#include <net/ethernet.h>
#include <net/if_arp.h>
#include <vm/vm.h> /* for vtophys */
#include <vm/pmap.h> /* for vtophys */

4
sys/pci/if_vx_pci.c
View File

@ -33,19 +33,23 @@
#include "vx.h"
#if NVX > 0
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_ether.h>
#endif
#ifdef NS
#include <netns/ns.h>
#include <netns/ns_if.h>