-# $OpenBSD: genassym.cf,v 1.34 2011/07/04 22:53:53 tedu Exp $
+# $OpenBSD: genassym.cf,v 1.35 2014/07/22 10:35:34 mpi Exp $
#
# Copyright (c) 1982, 1990 The Regents of the University of California.
# All rights reserved.
include <sys/mbuf.h>
include <sys/socketvar.h>
include <netinet/in.h>
-include <netinet/in_systm.h>
include <netinet/ip.h>
include <netinet/ip_var.h>
endif
-/* $OpenBSD: if_mc.c,v 1.16 2013/10/23 10:31:19 mpi Exp $ */
+/* $OpenBSD: if_mc.c,v 1.17 2014/07/22 10:35:35 mpi Exp $ */
/* $NetBSD: if_mc.c,v 1.9.16.1 2006/06/21 14:53:13 yamt Exp $ */
/*-
#include <net/if_dl.h>
#include <net/if_media.h>
-#include <uvm/uvm_extern.h>
-
-#ifdef INET
#include <netinet/in.h>
#include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#endif
#include "bpfilter.h"
#if NBPFILTER > 0
-/* $OpenBSD: cn30xxipd.c,v 1.3 2013/10/22 14:06:08 bcallah Exp $ */
+/* $OpenBSD: cn30xxipd.c,v 1.4 2014/07/22 10:35:35 mpi Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
#include <octeon/dev/cn30xxipdvar.h>
#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
#define IP_OFFSET(data, word2) \
((caddr_t)(data) + ((word2 & PIP_WQE_WORD2_IP_OFFSET) >> PIP_WQE_WORD2_IP_OFFSET_SHIFT))
-/* $OpenBSD: if_cnmac.c,v 1.14 2014/05/10 22:25:16 jasper Exp $ */
+/* $OpenBSD: if_cnmac.c,v 1.15 2014/07/22 10:35:35 mpi Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
#include <net/if_media.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
-#include <net/route.h>
#if NBPFILTER > 0
#include <net/bpf.h>
#endif
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-
#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/endian.h>
-/* $OpenBSD: in_cksum.c,v 1.9 2014/03/29 18:09:30 guenther Exp $ */
+/* $OpenBSD: in_cksum.c,v 1.10 2014/07/22 10:35:35 mpi Exp $ */
/* $NetBSD: in_cksum.c,v 1.7 2003/07/15 02:54:48 lukem Exp $ */
/*
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <sys/socketvar.h>
+
#include <netinet/in.h>
-#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <netinet/ip_var.h>
-/* $OpenBSD: if_iec.c,v 1.10 2014/05/19 21:18:42 miod Exp $ */
+/* $OpenBSD: if_iec.c,v 1.11 2014/07/22 10:35:35 mpi Exp $ */
/*
* Copyright (c) 2009 Miodrag Vallat.
#include <net/if_media.h>
#include <net/if_types.h>
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#endif
-
#if NBPFILTER > 0
#include <net/bpf.h>
#endif
+#include <netinet/in.h>
#include <netinet/if_ether.h>
#include <machine/autoconf.h>
-/* $OpenBSD: if_mec.c,v 1.26 2013/08/17 15:44:08 bluhm Exp $ */
+/* $OpenBSD: if_mec.c,v 1.27 2014/07/22 10:35:35 mpi Exp $ */
/* $NetBSD: if_mec_mace.c,v 1.5 2004/08/01 06:36:36 tsutsui Exp $ */
/*
#include <net/if_media.h>
#include <net/if_types.h>
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#endif
-
#if NBPFILTER > 0
#include <net/bpf.h>
#endif
+#include <netinet/in.h>
#include <netinet/if_ether.h>
#include <machine/bus.h>
-/* $OpenBSD: if_sq.c,v 1.9 2013/08/17 15:50:06 bluhm Exp $ */
+/* $OpenBSD: if_sq.c,v 1.10 2014/07/22 10:35:35 mpi Exp $ */
/* $NetBSD: if_sq.c,v 1.42 2011/07/01 18:53:47 dyoung Exp $ */
/*
#include <net/if_media.h>
#include <net/if_types.h>
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#endif
-
#if NBPFILTER > 0
#include <net/bpf.h>
#endif
+#include <netinet/in.h>
#include <netinet/if_ether.h>
#include <machine/autoconf.h>
-/* $OpenBSD: be.c,v 1.46 2013/12/24 01:11:04 dlg Exp $ */
+/* $OpenBSD: be.c,v 1.47 2014/07/22 10:35:35 mpi Exp $ */
/*
* Copyright (c) 1998 Theo de Raadt and Jason L. Wright.
#include <net/netisr.h>
#include <net/if_media.h>
-#ifdef INET
#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
#include <netinet/if_ether.h>
-#endif
#include "bpfilter.h"
#if NBPFILTER > 0
-/* $OpenBSD: hme.c,v 1.65 2014/04/22 15:52:05 naddy Exp $ */
+/* $OpenBSD: hme.c,v 1.66 2014/07/22 10:35:35 mpi Exp $ */
/*
* Copyright (c) 1998 Jason L. Wright (jason@thought.net)
#include <net/netisr.h>
#include <net/if_media.h>
-#ifdef INET
#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
#include <netinet/if_ether.h>
-#include <netinet/tcp.h>
-#include <netinet/udp.h>
-#endif
#if NBPFILTER > 0
#include <net/bpf.h>
-/* $OpenBSD: if_gem_sbus.c,v 1.2 2013/09/05 20:55:58 bluhm Exp $ */
+/* $OpenBSD: if_gem_sbus.c,v 1.3 2014/07/22 10:35:35 mpi Exp $ */
/* $NetBSD: if_gem_sbus.c,v 1.1 2006/11/24 13:23:32 martin Exp $ */
/*-
#include <net/if_dl.h>
#include <net/if_media.h>
-#ifdef INET
#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
#include <netinet/if_ether.h>
-#endif
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
-/* $OpenBSD: if_ie.c,v 1.46 2014/07/09 09:30:49 henning Exp $ */
+/* $OpenBSD: if_ie.c,v 1.47 2014/07/22 10:35:35 mpi Exp $ */
/* $NetBSD: if_ie.c,v 1.33 1997/07/29 17:55:38 fair Exp $ */
/*-
#include <net/bpfdesc.h>
#endif
-#ifdef INET
#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
#include <netinet/if_ether.h>
-#endif
#include <uvm/uvm_extern.h>
-#include <uvm/uvm_map.h>
/*
* ugly byte-order hack for SUNs
-/* $OpenBSD: if_ti_sbus.c,v 1.2 2013/09/05 20:55:58 bluhm Exp $ */
+/* $OpenBSD: if_ti_sbus.c,v 1.3 2014/07/22 10:35:35 mpi Exp $ */
/*
* Copyright (c) 2009 Mark Kettenis
*
#include <net/if_dl.h>
#include <net/if_media.h>
-#ifdef INET
#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
#include <netinet/if_ether.h>
-#endif
#include <machine/autoconf.h>
#include <machine/bus.h>
-/* $OpenBSD: qe.c,v 1.35 2013/11/27 08:56:31 mpi Exp $ */
+/* $OpenBSD: qe.c,v 1.36 2014/07/22 10:35:35 mpi Exp $ */
/*
* Copyright (c) 1998, 2000 Jason L. Wright.
#include <net/if_media.h>
#include <net/netisr.h>
-#ifdef INET
#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
#include <netinet/if_ether.h>
-#endif
#include "bpfilter.h"
#if NBPFILTER > 0
-/* $OpenBSD: qec.c,v 1.20 2013/09/05 20:55:58 bluhm Exp $ */
+/* $OpenBSD: qec.c,v 1.21 2014/07/22 10:35:35 mpi Exp $ */
/*
* Copyright (c) 1998 Theo de Raadt and Jason L. Wright.
#include <net/netisr.h>
#include <net/if_media.h>
-#ifdef INET
#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
#include <netinet/if_ether.h>
-#endif
#include <sparc/autoconf.h>
#include <sparc/cpu.h>
-/* $OpenBSD: in_cksum.c,v 1.13 2014/03/29 18:09:30 guenther Exp $ */
+/* $OpenBSD: in_cksum.c,v 1.14 2014/07/22 10:35:35 mpi Exp $ */
/* $NetBSD: in_cksum.c,v 1.7 1996/10/05 23:44:34 mrg Exp $ */
/*
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <sys/socketvar.h>
+
#include <netinet/in.h>
-#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <netinet/ip_var.h>