Module Name: src Committed By: msaitoh Date: Mon Jun 25 05:06:10 UTC 2018
Modified Files: src/sys/dev/pci: if_alc.c src/sys/dev/pci/ixgbe: ixgbe.h Log Message: Remove duplicated inclusion of net/bpf.h. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/if_alc.c cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pci/ixgbe/ixgbe.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/pci/if_alc.c diff -u src/sys/dev/pci/if_alc.c:1.26 src/sys/dev/pci/if_alc.c:1.27 --- src/sys/dev/pci/if_alc.c:1.26 Fri Jun 1 09:34:39 2018 +++ src/sys/dev/pci/if_alc.c Mon Jun 25 05:06:10 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if_alc.c,v 1.26 2018/06/01 09:34:39 maxv Exp $ */ +/* $NetBSD: if_alc.c,v 1.27 2018/06/25 05:06:10 msaitoh Exp $ */ /* $OpenBSD: if_alc.c,v 1.1 2009/08/08 09:31:13 kevlo Exp $ */ /*- * Copyright (c) 2009, Pyun YongHyeon <yong...@freebsd.org> @@ -49,14 +49,13 @@ #include <sys/bus.h> +#include <net/bpf.h> #include <net/if.h> #include <net/if_dl.h> #include <net/if_llc.h> #include <net/if_media.h> #include <net/if_ether.h> -#include <net/bpf.h> - #ifdef INET #include <netinet/in.h> #include <netinet/in_systm.h> @@ -67,8 +66,6 @@ #include <net/if_types.h> #include <net/if_vlanvar.h> -#include <net/bpf.h> - #include <dev/mii/mii.h> #include <dev/mii/miivar.h> Index: src/sys/dev/pci/ixgbe/ixgbe.h diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.49 src/sys/dev/pci/ixgbe/ixgbe.h:1.50 --- src/sys/dev/pci/ixgbe/ixgbe.h:1.49 Wed May 23 10:11:07 2018 +++ src/sys/dev/pci/ixgbe/ixgbe.h Mon Jun 25 05:06:10 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: ixgbe.h,v 1.49 2018/05/23 10:11:07 msaitoh Exp $ */ +/* $NetBSD: ixgbe.h,v 1.50 2018/06/25 05:06:10 msaitoh Exp $ */ /****************************************************************************** SPDX-License-Identifier: BSD-3-Clause @@ -89,7 +89,6 @@ #include <net/if_dl.h> #include <net/if_media.h> -#include <net/bpf.h> #include <net/if_types.h> #include <net/if_vlanvar.h>