diff --git a/src/add-ons/kernel/drivers/network/jmicron2x0/dev/jme/if_jme.c b/src/add-ons/kernel/drivers/network/jmicron2x0/dev/jme/if_jme.c index 5adaa3e19b..9f99cf200d 100644 --- a/src/add-ons/kernel/drivers/network/jmicron2x0/dev/jme/if_jme.c +++ b/src/add-ons/kernel/drivers/network/jmicron2x0/dev/jme/if_jme.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2008, Pyun YongHyeon * All rights reserved. * @@ -26,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: releng/11.1/sys/dev/jme/if_jme.c 298646 2016-04-26 15:03:15Z pfg $"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/jme/if_jme.c 333813 2018-05-18 20:13:34Z mmacy $"); #include #include @@ -557,7 +559,7 @@ jme_map_intr_vector(struct jme_softc *sc) bzero(map, sizeof(map)); /* Map Tx interrupts source to MSI/MSIX vector 2. */ - map[MSINUM_REG_INDEX(N_INTR_TXQ0_COMP)] = + map[MSINUM_REG_INDEX(N_INTR_TXQ0_COMP)] |= MSINUM_INTR_SOURCE(2, N_INTR_TXQ0_COMP); map[MSINUM_REG_INDEX(N_INTR_TXQ1_COMP)] |= MSINUM_INTR_SOURCE(2, N_INTR_TXQ1_COMP); @@ -579,37 +581,37 @@ jme_map_intr_vector(struct jme_softc *sc) MSINUM_INTR_SOURCE(2, N_INTR_TXQ_COAL_TO); /* Map Rx interrupts source to MSI/MSIX vector 1. */ - map[MSINUM_REG_INDEX(N_INTR_RXQ0_COMP)] = + map[MSINUM_REG_INDEX(N_INTR_RXQ0_COMP)] |= MSINUM_INTR_SOURCE(1, N_INTR_RXQ0_COMP); - map[MSINUM_REG_INDEX(N_INTR_RXQ1_COMP)] = + map[MSINUM_REG_INDEX(N_INTR_RXQ1_COMP)] |= MSINUM_INTR_SOURCE(1, N_INTR_RXQ1_COMP); - map[MSINUM_REG_INDEX(N_INTR_RXQ2_COMP)] = + map[MSINUM_REG_INDEX(N_INTR_RXQ2_COMP)] |= MSINUM_INTR_SOURCE(1, N_INTR_RXQ2_COMP); - map[MSINUM_REG_INDEX(N_INTR_RXQ3_COMP)] = + map[MSINUM_REG_INDEX(N_INTR_RXQ3_COMP)] |= MSINUM_INTR_SOURCE(1, N_INTR_RXQ3_COMP); - map[MSINUM_REG_INDEX(N_INTR_RXQ0_DESC_EMPTY)] = + map[MSINUM_REG_INDEX(N_INTR_RXQ0_DESC_EMPTY)] |= MSINUM_INTR_SOURCE(1, N_INTR_RXQ0_DESC_EMPTY); - map[MSINUM_REG_INDEX(N_INTR_RXQ1_DESC_EMPTY)] = + map[MSINUM_REG_INDEX(N_INTR_RXQ1_DESC_EMPTY)] |= MSINUM_INTR_SOURCE(1, N_INTR_RXQ1_DESC_EMPTY); - map[MSINUM_REG_INDEX(N_INTR_RXQ2_DESC_EMPTY)] = + map[MSINUM_REG_INDEX(N_INTR_RXQ2_DESC_EMPTY)] |= MSINUM_INTR_SOURCE(1, N_INTR_RXQ2_DESC_EMPTY); - map[MSINUM_REG_INDEX(N_INTR_RXQ3_DESC_EMPTY)] = + map[MSINUM_REG_INDEX(N_INTR_RXQ3_DESC_EMPTY)] |= MSINUM_INTR_SOURCE(1, N_INTR_RXQ3_DESC_EMPTY); - map[MSINUM_REG_INDEX(N_INTR_RXQ0_COAL)] = + map[MSINUM_REG_INDEX(N_INTR_RXQ0_COAL)] |= MSINUM_INTR_SOURCE(1, N_INTR_RXQ0_COAL); - map[MSINUM_REG_INDEX(N_INTR_RXQ1_COAL)] = + map[MSINUM_REG_INDEX(N_INTR_RXQ1_COAL)] |= MSINUM_INTR_SOURCE(1, N_INTR_RXQ1_COAL); - map[MSINUM_REG_INDEX(N_INTR_RXQ2_COAL)] = + map[MSINUM_REG_INDEX(N_INTR_RXQ2_COAL)] |= MSINUM_INTR_SOURCE(1, N_INTR_RXQ2_COAL); - map[MSINUM_REG_INDEX(N_INTR_RXQ3_COAL)] = + map[MSINUM_REG_INDEX(N_INTR_RXQ3_COAL)] |= MSINUM_INTR_SOURCE(1, N_INTR_RXQ3_COAL); - map[MSINUM_REG_INDEX(N_INTR_RXQ0_COAL_TO)] = + map[MSINUM_REG_INDEX(N_INTR_RXQ0_COAL_TO)] |= MSINUM_INTR_SOURCE(1, N_INTR_RXQ0_COAL_TO); - map[MSINUM_REG_INDEX(N_INTR_RXQ1_COAL_TO)] = + map[MSINUM_REG_INDEX(N_INTR_RXQ1_COAL_TO)] |= MSINUM_INTR_SOURCE(1, N_INTR_RXQ1_COAL_TO); - map[MSINUM_REG_INDEX(N_INTR_RXQ2_COAL_TO)] = + map[MSINUM_REG_INDEX(N_INTR_RXQ2_COAL_TO)] |= MSINUM_INTR_SOURCE(1, N_INTR_RXQ2_COAL_TO); - map[MSINUM_REG_INDEX(N_INTR_RXQ3_COAL_TO)] = + map[MSINUM_REG_INDEX(N_INTR_RXQ3_COAL_TO)] |= MSINUM_INTR_SOURCE(1, N_INTR_RXQ3_COAL_TO); /* Map all other interrupts source to MSI/MSIX vector 0. */ diff --git a/src/add-ons/kernel/drivers/network/jmicron2x0/dev/jme/if_jmereg.h b/src/add-ons/kernel/drivers/network/jmicron2x0/dev/jme/if_jmereg.h index 592357bb44..1b1ff48057 100644 --- a/src/add-ons/kernel/drivers/network/jmicron2x0/dev/jme/if_jmereg.h +++ b/src/add-ons/kernel/drivers/network/jmicron2x0/dev/jme/if_jmereg.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2008, Pyun YongHyeon * All rights reserved. * @@ -24,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: releng/11.1/sys/dev/jme/if_jmereg.h 298955 2016-05-03 03:41:25Z pfg $ + * $FreeBSD: releng/12.0/sys/dev/jme/if_jmereg.h 326255 2017-11-27 14:52:40Z pfg $ */ #ifndef _IF_JMEREG_H diff --git a/src/add-ons/kernel/drivers/network/jmicron2x0/dev/jme/if_jmevar.h b/src/add-ons/kernel/drivers/network/jmicron2x0/dev/jme/if_jmevar.h index 765b9233d2..904c0694f9 100644 --- a/src/add-ons/kernel/drivers/network/jmicron2x0/dev/jme/if_jmevar.h +++ b/src/add-ons/kernel/drivers/network/jmicron2x0/dev/jme/if_jmevar.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2008, Pyun YongHyeon * All rights reserved. * @@ -24,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: releng/11.1/sys/dev/jme/if_jmevar.h 298955 2016-05-03 03:41:25Z pfg $ + * $FreeBSD: releng/12.0/sys/dev/jme/if_jmevar.h 326255 2017-11-27 14:52:40Z pfg $ */ #ifndef _IF_JMEVAR_H diff --git a/src/add-ons/kernel/drivers/network/jmicron2x0/dev/mii/jmphy.c b/src/add-ons/kernel/drivers/network/jmicron2x0/dev/mii/jmphy.c index 5571a89e91..7795791124 100644 --- a/src/add-ons/kernel/drivers/network/jmicron2x0/dev/mii/jmphy.c +++ b/src/add-ons/kernel/drivers/network/jmicron2x0/dev/mii/jmphy.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2008, Pyun YongHyeon * All rights reserved. * @@ -26,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: releng/11.1/sys/dev/mii/jmphy.c 277108 2015-01-13 06:56:04Z glebius $"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/mii/jmphy.c 326255 2017-11-27 14:52:40Z pfg $"); /* * Driver for the JMicron JMP211 10/100/1000, JMP202 10/100 PHY. diff --git a/src/add-ons/kernel/drivers/network/jmicron2x0/dev/mii/jmphyreg.h b/src/add-ons/kernel/drivers/network/jmicron2x0/dev/mii/jmphyreg.h index 4ec10d74c7..0e56de81bb 100644 --- a/src/add-ons/kernel/drivers/network/jmicron2x0/dev/mii/jmphyreg.h +++ b/src/add-ons/kernel/drivers/network/jmicron2x0/dev/mii/jmphyreg.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2008, Pyun YongHyeon * All rights reserved. * @@ -24,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: releng/11.1/sys/dev/mii/jmphyreg.h 216551 2010-12-18 23:52:50Z yongari $ + * $FreeBSD: releng/12.0/sys/dev/mii/jmphyreg.h 326255 2017-11-27 14:52:40Z pfg $ */ #ifndef _DEV_MII_JMPHYREG_H_ diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/brgphyreg.h b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/brgphyreg.h index b3535d59fb..aeed8e1661 100644 --- a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/brgphyreg.h +++ b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/brgphyreg.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 2000 * Bill Paul . All rights reserved. * @@ -29,7 +31,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: releng/12.0/sys/dev/mii/brgphyreg.h 325966 2017-11-18 14:26:50Z pfg $ */ #ifndef _DEV_MII_BRGPHYREG_H_ diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/e1000phy.c b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/e1000phy.c index d97c7d5986..f60cfeb503 100644 --- a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/e1000phy.c +++ b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/e1000phy.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * * Principal Author: Parag Patel * Copyright (c) 2001 * All rights reserved. @@ -30,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/mii/e1000phy.c 326255 2017-11-27 14:52:40Z pfg $"); /* * driver for the Marvell 88E1000 series external 1000/100/10-BT PHY. diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/e1000phyreg.h b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/e1000phyreg.h index e5d5cf961a..71dba72870 100644 --- a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/e1000phyreg.h +++ b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/e1000phyreg.h @@ -1,4 +1,4 @@ -/* $FreeBSD$ */ +/* $FreeBSD: releng/12.0/sys/dev/mii/e1000phyreg.h 326022 2017-11-20 19:36:21Z pfg $ */ /*- * Principal Author: Parag Patel * Copyright (c) 2001 @@ -31,6 +31,8 @@ */ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Derived by information released by Intel under the following license: * * Copyright (c) 1999 - 2001, Intel Corporation diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/ukphy.c index 45addcbc75..ea101c4ba4 100644 --- a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/ukphy.c +++ b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/ukphy.c @@ -1,6 +1,8 @@ /* $NetBSD: ukphy.c,v 1.2 1999/04/23 04:24:32 thorpej Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. * @@ -55,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/mii/ukphy.c 326255 2017-11-27 14:52:40Z pfg $"); /* * driver for generic unknown PHYs diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/ukphy_subr.c index 5f2f6341ba..e3d88c96c9 100644 --- a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/ukphy_subr.c +++ b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/ukphy_subr.c @@ -1,6 +1,8 @@ /* $NetBSD: ukphy_subr.c,v 1.2 1998/11/05 04:08:02 thorpej Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. * @@ -31,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/mii/ukphy_subr.c 326255 2017-11-27 14:52:40Z pfg $"); /* * Subroutines shared by the ukphy driver and other PHY drivers. diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/if_msk.c b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/if_msk.c index 9fab383d58..e670b84c60 100644 --- a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/if_msk.c +++ b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/if_msk.c @@ -46,6 +46,8 @@ *****************************************************************************/ /*- + * SPDX-License-Identifier: BSD-4-Clause AND BSD-3-Clause + * * Copyright (c) 1997, 1998, 1999, 2000 * Bill Paul . All rights reserved. * @@ -99,7 +101,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/msk/if_msk.c 333813 2018-05-18 20:13:34Z mmacy $"); #include #include @@ -4511,7 +4513,7 @@ msk_sysctl_node(struct msk_if_softc *sc_if) tree = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "stats", CTLFLAG_RD, NULL, "MSK Statistics"); - schild = child = SYSCTL_CHILDREN(tree); + schild = SYSCTL_CHILDREN(tree); tree = SYSCTL_ADD_NODE(ctx, schild, OID_AUTO, "rx", CTLFLAG_RD, NULL, "MSK RX Statistics"); child = SYSCTL_CHILDREN(tree); diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/if_mskreg.h b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/if_mskreg.h index 0e7e951a74..90c3ff18e4 100644 --- a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/if_mskreg.h +++ b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/if_mskreg.h @@ -46,6 +46,8 @@ ******************************************************************************/ /*- + * SPDX-License-Identifier: BSD-4-Clause AND BSD-3-Clause + * * Copyright (c) 1997, 1998, 1999, 2000 * Bill Paul . All rights reserved. * @@ -93,7 +95,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*$FreeBSD$*/ +/*$FreeBSD: releng/12.0/sys/dev/msk/if_mskreg.h 325966 2017-11-18 14:26:50Z pfg $*/ /* * SysKonnect PCI vendor ID diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/glue.c b/src/add-ons/kernel/drivers/network/marvell_yukon/glue.c index 13911c7144..07b18e8b7b 100644 --- a/src/add-ons/kernel/drivers/network/marvell_yukon/glue.c +++ b/src/add-ons/kernel/drivers/network/marvell_yukon/glue.c @@ -17,6 +17,7 @@ #include +HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE | FBSD_SWI_TASKQUEUE); HAIKU_FBSD_DRIVER_GLUE(marvell_yukon, mskc, pci) extern driver_t *DRIVER_MODULE_NAME(e1000phy, miibus); @@ -67,6 +68,3 @@ HAIKU_REENABLE_INTERRUPTS(device_t dev) struct msk_softc *sc = device_get_softc(dev); CSR_WRITE_4(sc, B0_Y2_SP_ICR, 2); } - - -HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE | FBSD_SWI_TASKQUEUE); diff --git a/src/add-ons/kernel/drivers/network/nforce/dev/mii/ciphy.c b/src/add-ons/kernel/drivers/network/nforce/dev/mii/ciphy.c index 2d2816cddf..d064dfe156 100644 --- a/src/add-ons/kernel/drivers/network/nforce/dev/mii/ciphy.c +++ b/src/add-ons/kernel/drivers/network/nforce/dev/mii/ciphy.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 2004 * Bill Paul . All rights reserved. * @@ -31,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/mii/ciphy.c 325966 2017-11-18 14:26:50Z pfg $"); /* * Driver for the Cicada/Vitesse CS/VSC8xxx 10/100/1000 copper PHY. diff --git a/src/add-ons/kernel/drivers/network/nforce/dev/mii/ciphyreg.h b/src/add-ons/kernel/drivers/network/nforce/dev/mii/ciphyreg.h index dd73f87783..4ba2444eda 100644 --- a/src/add-ons/kernel/drivers/network/nforce/dev/mii/ciphyreg.h +++ b/src/add-ons/kernel/drivers/network/nforce/dev/mii/ciphyreg.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 2004 * Bill Paul . All rights reserved. * @@ -29,7 +31,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: releng/12.0/sys/dev/mii/ciphyreg.h 325966 2017-11-18 14:26:50Z pfg $ */ #ifndef _DEV_MII_CIPHYREG_H_ diff --git a/src/add-ons/kernel/drivers/network/nforce/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/nforce/dev/mii/ukphy.c index 45addcbc75..ea101c4ba4 100644 --- a/src/add-ons/kernel/drivers/network/nforce/dev/mii/ukphy.c +++ b/src/add-ons/kernel/drivers/network/nforce/dev/mii/ukphy.c @@ -1,6 +1,8 @@ /* $NetBSD: ukphy.c,v 1.2 1999/04/23 04:24:32 thorpej Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. * @@ -55,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/mii/ukphy.c 326255 2017-11-27 14:52:40Z pfg $"); /* * driver for generic unknown PHYs diff --git a/src/add-ons/kernel/drivers/network/nforce/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/nforce/dev/mii/ukphy_subr.c index 5f2f6341ba..e3d88c96c9 100644 --- a/src/add-ons/kernel/drivers/network/nforce/dev/mii/ukphy_subr.c +++ b/src/add-ons/kernel/drivers/network/nforce/dev/mii/ukphy_subr.c @@ -1,6 +1,8 @@ /* $NetBSD: ukphy_subr.c,v 1.2 1998/11/05 04:08:02 thorpej Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. * @@ -31,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/mii/ukphy_subr.c 326255 2017-11-27 14:52:40Z pfg $"); /* * Subroutines shared by the ukphy driver and other PHY drivers. diff --git a/src/add-ons/kernel/drivers/network/nforce/dev/nfe/if_nfe.c b/src/add-ons/kernel/drivers/network/nforce/dev/nfe/if_nfe.c index d3accc57bd..6a05d43762 100644 --- a/src/add-ons/kernel/drivers/network/nforce/dev/nfe/if_nfe.c +++ b/src/add-ons/kernel/drivers/network/nforce/dev/nfe/if_nfe.c @@ -21,7 +21,7 @@ /* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/nfe/if_nfe.c 298307 2016-04-19 23:37:24Z pfg $"); #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" diff --git a/src/add-ons/kernel/drivers/network/nforce/dev/nfe/if_nfereg.h b/src/add-ons/kernel/drivers/network/nforce/dev/nfe/if_nfereg.h index 748c25b760..d6f144fa7b 100644 --- a/src/add-ons/kernel/drivers/network/nforce/dev/nfe/if_nfereg.h +++ b/src/add-ons/kernel/drivers/network/nforce/dev/nfe/if_nfereg.h @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD$ + * $FreeBSD: releng/12.0/sys/dev/nfe/if_nfereg.h 263957 2014-03-31 01:54:59Z yongari $ */ #define NFE_RX_RING_COUNT 256 diff --git a/src/add-ons/kernel/drivers/network/nforce/dev/nfe/if_nfevar.h b/src/add-ons/kernel/drivers/network/nforce/dev/nfe/if_nfevar.h index c2e34f1687..567dd89bf3 100644 --- a/src/add-ons/kernel/drivers/network/nforce/dev/nfe/if_nfevar.h +++ b/src/add-ons/kernel/drivers/network/nforce/dev/nfe/if_nfevar.h @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD$ + * $FreeBSD: releng/12.0/sys/dev/nfe/if_nfevar.h 216925 2011-01-03 18:28:30Z jhb $ */ struct nfe_tx_data { diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/am7990.c b/src/add-ons/kernel/drivers/network/pcnet/dev/le/am7990.c index 32c2e1e65e..769c9ed1b3 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/le/am7990.c +++ b/src/add-ons/kernel/drivers/network/pcnet/dev/le/am7990.c @@ -1,6 +1,8 @@ /* $NetBSD: am7990.c,v 1.68 2005/12/11 12:21:25 christos Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause + * * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. * @@ -65,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/le/am7990.c 326255 2017-11-27 14:52:40Z pfg $"); #include #include diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/am79900.c b/src/add-ons/kernel/drivers/network/pcnet/dev/le/am79900.c index a423be6633..4a84c2e9f6 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/le/am79900.c +++ b/src/add-ons/kernel/drivers/network/pcnet/dev/le/am79900.c @@ -1,6 +1,8 @@ /* $NetBSD: am79900.c,v 1.17 2005/12/24 20:27:29 perry Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause + * * Copyright (c) 1997 The NetBSD Foundation, Inc. * All rights reserved. * @@ -103,7 +105,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/le/am79900.c 326255 2017-11-27 14:52:40Z pfg $"); #include #include @@ -254,7 +256,7 @@ am79900_rint(struct lance_softc *sc) struct lermd rmd; uint32_t rmd1; int bix, rp; -#if defined(__i386__) && !defined(PC98) +#if defined(__i386__) struct ether_header *eh; #endif @@ -315,7 +317,7 @@ am79900_rint(struct lance_softc *sc) if (m != NULL) { if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1); -#if defined(__i386__) && !defined(PC98) +#if defined(__i386__) /* * The VMware LANCE does not present IFF_SIMPLEX * behavior on multicast packets. Thus drop the diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/am79900reg.h b/src/add-ons/kernel/drivers/network/pcnet/dev/le/am79900reg.h index 620a1ddc27..fe63a5cdf6 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/le/am79900reg.h +++ b/src/add-ons/kernel/drivers/network/pcnet/dev/le/am79900reg.h @@ -1,6 +1,8 @@ /* $NetBSD: am79900reg.h,v 1.8 2005/12/11 12:21:25 christos Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause + * * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. * @@ -63,7 +65,7 @@ * @(#)if_lereg.h 8.1 (Berkeley) 6/10/93 */ -/* $FreeBSD$ */ +/* $FreeBSD: releng/12.0/sys/dev/le/am79900reg.h 326255 2017-11-27 14:52:40Z pfg $ */ #ifndef _DEV_LE_AM79900REG_H_ #define _DEV_LE_AM79900REG_H_ diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/am79900var.h b/src/add-ons/kernel/drivers/network/pcnet/dev/le/am79900var.h index 79ab3309e1..9ddc8bd9cb 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/le/am79900var.h +++ b/src/add-ons/kernel/drivers/network/pcnet/dev/le/am79900var.h @@ -1,6 +1,8 @@ /* $NetBSD: am79900var.h,v 1.4 2005/12/11 12:21:25 christos Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. * @@ -30,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD$ */ +/* $FreeBSD: releng/12.0/sys/dev/le/am79900var.h 326255 2017-11-27 14:52:40Z pfg $ */ #ifndef _DEV_LE_AM79900VAR_H_ #define _DEV_LE_AM79900VAR_H_ diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/am7990reg.h b/src/add-ons/kernel/drivers/network/pcnet/dev/le/am7990reg.h index 1cc4dcb7d1..b3500917c8 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/le/am7990reg.h +++ b/src/add-ons/kernel/drivers/network/pcnet/dev/le/am7990reg.h @@ -30,6 +30,8 @@ */ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. * @@ -63,7 +65,7 @@ * @(#)if_lereg.h 8.1 (Berkeley) 6/10/93 */ -/* $FreeBSD$ */ +/* $FreeBSD: releng/12.0/sys/dev/le/am7990reg.h 326255 2017-11-27 14:52:40Z pfg $ */ #ifndef _DEV_LE_AM7990REG_H_ #define _DEV_LE_AM7990REG_H_ diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/am7990var.h b/src/add-ons/kernel/drivers/network/pcnet/dev/le/am7990var.h index 24cbfe05af..fee4b9b9b0 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/le/am7990var.h +++ b/src/add-ons/kernel/drivers/network/pcnet/dev/le/am7990var.h @@ -1,6 +1,8 @@ /* $NetBSD: am7990var.h,v 1.23 2005/12/11 12:21:25 christos Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. * @@ -30,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD$ */ +/* $FreeBSD: releng/12.0/sys/dev/le/am7990var.h 326255 2017-11-27 14:52:40Z pfg $ */ #ifndef _DEV_LE_AM7990VAR_H_ #define _DEV_LE_AM7990VAR_H_ diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/if_le_ledma.c b/src/add-ons/kernel/drivers/network/pcnet/dev/le/if_le_ledma.c index e86f947be5..71a7bdc1a2 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/le/if_le_ledma.c +++ b/src/add-ons/kernel/drivers/network/pcnet/dev/le/if_le_ledma.c @@ -1,6 +1,8 @@ /* $NetBSD: if_le_ledma.c,v 1.26 2005/12/11 12:23:44 christos Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. * @@ -31,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/le/if_le_ledma.c 326255 2017-11-27 14:52:40Z pfg $"); #include #include diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/if_le_pci.c b/src/add-ons/kernel/drivers/network/pcnet/dev/le/if_le_pci.c index 1146472393..6d2d779b8b 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/le/if_le_pci.c +++ b/src/add-ons/kernel/drivers/network/pcnet/dev/le/if_le_pci.c @@ -1,6 +1,8 @@ /* $NetBSD: if_le_pci.c,v 1.43 2005/12/11 12:22:49 christos Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause + * * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. * @@ -65,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/le/if_le_pci.c 326255 2017-11-27 14:52:40Z pfg $"); #include #include diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/lance.c b/src/add-ons/kernel/drivers/network/pcnet/dev/le/lance.c index 2eee7af1b8..8ede219fdf 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/le/lance.c +++ b/src/add-ons/kernel/drivers/network/pcnet/dev/le/lance.c @@ -1,6 +1,8 @@ /* $NetBSD: lance.c,v 1.34 2005/12/24 20:27:30 perry Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. * @@ -65,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/le/lance.c 333813 2018-05-18 20:13:34Z mmacy $"); #include #include diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/lancereg.h b/src/add-ons/kernel/drivers/network/pcnet/dev/le/lancereg.h index 7c1a5a8766..f41d147903 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/le/lancereg.h +++ b/src/add-ons/kernel/drivers/network/pcnet/dev/le/lancereg.h @@ -1,6 +1,8 @@ /* $NetBSD: lancereg.h,v 1.12 2005/12/11 12:21:27 christos Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. * All rights reserved. * @@ -113,7 +115,7 @@ * valid on the LANCE. */ -/* $FreeBSD$ */ +/* $FreeBSD: releng/12.0/sys/dev/le/lancereg.h 326255 2017-11-27 14:52:40Z pfg $ */ #ifndef _DEV_LE_LANCEREG_H_ #define _DEV_LE_LANCEREG_H_ diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/le/lancevar.h b/src/add-ons/kernel/drivers/network/pcnet/dev/le/lancevar.h index 1491ea762a..40633c7b01 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/le/lancevar.h +++ b/src/add-ons/kernel/drivers/network/pcnet/dev/le/lancevar.h @@ -1,6 +1,8 @@ /* $NetBSD: lancevar.h,v 1.10 2005/12/11 12:21:27 christos Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. * @@ -30,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD$ */ +/* $FreeBSD: releng/12.0/sys/dev/le/lancevar.h 326255 2017-11-27 14:52:40Z pfg $ */ #ifndef _DEV_LE_LANCEVAR_H_ #define _DEV_LE_LANCEVAR_H_ diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphy.c b/src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphy.c index 748e02a419..29be2c053c 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphy.c +++ b/src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphy.c @@ -1,6 +1,8 @@ /* $NetBSD: nsphy.c,v 1.18 1999/07/14 23:57:36 thorpej Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-2-Clause + * * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. * @@ -55,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/mii/nsphy.c 326255 2017-11-27 14:52:40Z pfg $"); /* * driver for National Semiconductor's DP83840A ethernet 10/100 PHY diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphyreg.h b/src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphyreg.h index 71fcfb687c..8334f25444 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphyreg.h +++ b/src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphyreg.h @@ -1,6 +1,8 @@ /* $NetBSD: nsphyreg.h,v 1.1 1998/08/10 23:58:39 thorpej Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. * @@ -29,7 +31,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: releng/12.0/sys/dev/mii/nsphyreg.h 326255 2017-11-27 14:52:40Z pfg $ */ #ifndef _DEV_MII_NSPHYREG_H_ diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphyter.c b/src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphyter.c index 00c0550a8c..8af26e9766 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphyter.c +++ b/src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphyter.c @@ -1,6 +1,8 @@ /* $NetBSD: nsphyter.c,v 1.28 2008/01/20 07:58:19 msaitoh Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-2-Clause + * * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. * All rights reserved. * @@ -55,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/mii/nsphyter.c 326255 2017-11-27 14:52:40Z pfg $"); /* * Driver for the National Semiconductor's DP83843, DP83847 and DP83849 diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphyterreg.h b/src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphyterreg.h index 3bf5208ab9..682c550083 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphyterreg.h +++ b/src/add-ons/kernel/drivers/network/pcnet/dev/mii/nsphyterreg.h @@ -1,6 +1,8 @@ /* $NetBSD: nsphyterreg.h,v 1.4 2005/12/11 12:22:42 christos Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc. * All rights reserved. * @@ -29,7 +31,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: releng/12.0/sys/dev/mii/nsphyterreg.h 326255 2017-11-27 14:52:40Z pfg $ */ #ifndef _DEV_MII_NSPHYTERREG_H_ diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/pcnet/dev/mii/ukphy.c index 45addcbc75..ea101c4ba4 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/mii/ukphy.c +++ b/src/add-ons/kernel/drivers/network/pcnet/dev/mii/ukphy.c @@ -1,6 +1,8 @@ /* $NetBSD: ukphy.c,v 1.2 1999/04/23 04:24:32 thorpej Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. * @@ -55,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/mii/ukphy.c 326255 2017-11-27 14:52:40Z pfg $"); /* * driver for generic unknown PHYs diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/pcnet/dev/mii/ukphy_subr.c index 5f2f6341ba..e3d88c96c9 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/mii/ukphy_subr.c +++ b/src/add-ons/kernel/drivers/network/pcnet/dev/mii/ukphy_subr.c @@ -1,6 +1,8 @@ /* $NetBSD: ukphy_subr.c,v 1.2 1998/11/05 04:08:02 thorpej Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. * @@ -31,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/mii/ukphy_subr.c 326255 2017-11-27 14:52:40Z pfg $"); /* * Subroutines shared by the ukphy driver and other PHY drivers. diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/pcn/if_pcn.c b/src/add-ons/kernel/drivers/network/pcnet/dev/pcn/if_pcn.c index d63d4aaeb3..378deb2c88 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/pcn/if_pcn.c +++ b/src/add-ons/kernel/drivers/network/pcnet/dev/pcn/if_pcn.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 2000 Berkeley Software Design, Inc. * Copyright (c) 1997, 1998, 1999, 2000 * Bill Paul . All rights reserved. @@ -32,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/pcn/if_pcn.c 339735 2018-10-25 17:00:39Z brooks $"); /* * AMD Am79c972 fast ethernet PCI NIC driver. Datasheets are available @@ -191,6 +193,8 @@ static driver_t pcn_driver = { static devclass_t pcn_devclass; DRIVER_MODULE(pcn, pci, pcn_driver, pcn_devclass, 0, 0); +MODULE_PNP_INFO("U16:vendor;U16:device", pci, pcn, pcn_devs, + nitems(pcn_devs) - 1); DRIVER_MODULE(miibus, pcn, miibus_driver, miibus_devclass, 0, 0); #define PCN_CSR_SETBIT(sc, reg, x) \ @@ -1453,7 +1457,7 @@ pcn_watchdog(struct pcn_softc *sc) static void pcn_stop(struct pcn_softc *sc) { - register int i; + int i; struct ifnet *ifp; PCN_LOCK_ASSERT(sc); diff --git a/src/add-ons/kernel/drivers/network/pcnet/dev/pcn/if_pcnreg.h b/src/add-ons/kernel/drivers/network/pcnet/dev/pcn/if_pcnreg.h index a10edfd76a..2644fee21b 100644 --- a/src/add-ons/kernel/drivers/network/pcnet/dev/pcn/if_pcnreg.h +++ b/src/add-ons/kernel/drivers/network/pcnet/dev/pcn/if_pcnreg.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 2000 Berkeley Software Design, Inc. * Copyright (c) 1997, 1998, 1999, 2000 * Bill Paul . All rights reserved. @@ -30,7 +32,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: releng/12.0/sys/dev/pcn/if_pcnreg.h 325966 2017-11-18 14:26:50Z pfg $ */ /* diff --git a/src/add-ons/kernel/drivers/network/rdc/dev/mii/rdcphy.c b/src/add-ons/kernel/drivers/network/rdc/dev/mii/rdcphy.c index c411eaecfa..d6c4ac9055 100644 --- a/src/add-ons/kernel/drivers/network/rdc/dev/mii/rdcphy.c +++ b/src/add-ons/kernel/drivers/network/rdc/dev/mii/rdcphy.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2010, Pyun YongHyeon * All rights reserved. * @@ -26,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/mii/rdcphy.c 327173 2017-12-25 04:48:39Z kan $"); /* * Driver for the RDC Semiconductor R6040 10/100 PHY. @@ -183,11 +185,9 @@ static void rdcphy_status(struct mii_softc *sc) { struct mii_data *mii; - struct ifmedia_entry *ife; int bmsr, bmcr, physts; mii = sc->mii_pdata; - ife = mii->mii_media.ifm_cur; mii->mii_media_status = IFM_AVALID; mii->mii_media_active = IFM_ETHER; diff --git a/src/add-ons/kernel/drivers/network/rdc/dev/mii/rdcphyreg.h b/src/add-ons/kernel/drivers/network/rdc/dev/mii/rdcphyreg.h index 44b14a467b..831c8067b4 100644 --- a/src/add-ons/kernel/drivers/network/rdc/dev/mii/rdcphyreg.h +++ b/src/add-ons/kernel/drivers/network/rdc/dev/mii/rdcphyreg.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2010, Pyun YongHyeon * All rights reserved. * @@ -24,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: releng/12.0/sys/dev/mii/rdcphyreg.h 326255 2017-11-27 14:52:40Z pfg $ */ #ifndef _DEV_MII_RDCPHYREG_H_ diff --git a/src/add-ons/kernel/drivers/network/rdc/dev/vte/if_vte.c b/src/add-ons/kernel/drivers/network/rdc/dev/vte/if_vte.c index d3eb06a6ba..460af1f246 100644 --- a/src/add-ons/kernel/drivers/network/rdc/dev/vte/if_vte.c +++ b/src/add-ons/kernel/drivers/network/rdc/dev/vte/if_vte.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2010, Pyun YongHyeon * All rights reserved. * @@ -28,7 +30,7 @@ /* Driver for DM&P Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/vte/if_vte.c 333813 2018-05-18 20:13:34Z mmacy $"); #include #include diff --git a/src/add-ons/kernel/drivers/network/rdc/dev/vte/if_vtereg.h b/src/add-ons/kernel/drivers/network/rdc/dev/vte/if_vtereg.h index 536617b88c..a09f4aab0c 100644 --- a/src/add-ons/kernel/drivers/network/rdc/dev/vte/if_vtereg.h +++ b/src/add-ons/kernel/drivers/network/rdc/dev/vte/if_vtereg.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2010, Pyun YongHyeon * All rights reserved. * @@ -24,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: releng/12.0/sys/dev/vte/if_vtereg.h 326255 2017-11-27 14:52:40Z pfg $ */ #ifndef _IF_VTEREG_H diff --git a/src/add-ons/kernel/drivers/network/rdc/dev/vte/if_vtevar.h b/src/add-ons/kernel/drivers/network/rdc/dev/vte/if_vtevar.h index a8e79d09c6..2ce72e7130 100644 --- a/src/add-ons/kernel/drivers/network/rdc/dev/vte/if_vtevar.h +++ b/src/add-ons/kernel/drivers/network/rdc/dev/vte/if_vtevar.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2010, Pyun YongHyeon * All rights reserved. * @@ -24,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: releng/12.0/sys/dev/vte/if_vtevar.h 326255 2017-11-27 14:52:40Z pfg $ */ #ifndef _IF_VTEVAR_H