From eababbb4cf46a709dec2c130ea69c4542934d1ff Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 4 Jan 2019 21:15:15 -0500 Subject: [PATCH] drivers/network: Upgrade sis900, syskonnect, via_rhine, vt612x to FreeBSD 12. No real functional change. --- .../kernel/drivers/network/sis900/dev/mii/icsphy.c | 4 +++- .../kernel/drivers/network/sis900/dev/mii/icsphyreg.h | 4 +++- .../kernel/drivers/network/sis900/dev/mii/nsphyter.c | 4 +++- .../drivers/network/sis900/dev/mii/nsphyterreg.h | 4 +++- .../kernel/drivers/network/sis900/dev/mii/ukphy.c | 4 +++- .../kernel/drivers/network/sis900/dev/mii/ukphy_subr.c | 4 +++- .../kernel/drivers/network/sis900/dev/sis/if_sis.c | 4 +++- .../kernel/drivers/network/sis900/dev/sis/if_sisreg.h | 4 +++- .../drivers/network/syskonnect/dev/mii/brgphyreg.h | 4 +++- .../drivers/network/syskonnect/dev/mii/e1000phy.c | 4 +++- .../drivers/network/syskonnect/dev/mii/e1000phyreg.h | 4 +++- .../kernel/drivers/network/syskonnect/dev/mii/ukphy.c | 4 +++- .../drivers/network/syskonnect/dev/mii/ukphy_subr.c | 4 +++- .../kernel/drivers/network/syskonnect/dev/mii/xmphy.c | 4 +++- .../drivers/network/syskonnect/dev/mii/xmphyreg.h | 4 +++- .../kernel/drivers/network/syskonnect/dev/sk/if_sk.c | 10 ++++++---- .../drivers/network/syskonnect/dev/sk/if_skreg.h | 4 +++- .../drivers/network/syskonnect/dev/sk/xmaciireg.h | 4 +++- .../drivers/network/syskonnect/dev/sk/yukonreg.h | 2 +- .../kernel/drivers/network/via_rhine/dev/mii/ciphy.c | 4 +++- .../drivers/network/via_rhine/dev/mii/ciphyreg.h | 4 +++- .../kernel/drivers/network/via_rhine/dev/mii/ukphy.c | 4 +++- .../drivers/network/via_rhine/dev/mii/ukphy_subr.c | 4 +++- .../kernel/drivers/network/via_rhine/dev/vr/if_vr.c | 4 +++- .../kernel/drivers/network/via_rhine/dev/vr/if_vrreg.h | 4 +++- .../kernel/drivers/network/vt612x/dev/mii/ciphy.c | 4 +++- .../kernel/drivers/network/vt612x/dev/mii/ciphyreg.h | 4 +++- .../kernel/drivers/network/vt612x/dev/mii/ukphy.c | 4 +++- .../kernel/drivers/network/vt612x/dev/mii/ukphy_subr.c | 4 +++- .../kernel/drivers/network/vt612x/dev/vge/if_vge.c | 4 +++- .../kernel/drivers/network/vt612x/dev/vge/if_vgereg.h | 4 +++- .../kernel/drivers/network/vt612x/dev/vge/if_vgevar.h | 4 +++- 32 files changed, 97 insertions(+), 35 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/sis900/dev/mii/icsphy.c b/src/add-ons/kernel/drivers/network/sis900/dev/mii/icsphy.c index 0d2209f9e4..e1920153ae 100644 --- a/src/add-ons/kernel/drivers/network/sis900/dev/mii/icsphy.c +++ b/src/add-ons/kernel/drivers/network/sis900/dev/mii/icsphy.c @@ -1,6 +1,8 @@ /* $NetBSD: icsphy.c,v 1.41 2006/11/16 21:24:07 christos Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. * All rights reserved. * @@ -55,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: stable/11/sys/dev/mii/icsphy.c 337755 2018-08-14 14:17:20Z markj $"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/mii/icsphy.c 337425 2018-08-07 17:13:42Z markj $"); /* * driver for Integrated Circuit Systems' ICS1889-1893 ethernet 10/100 PHY diff --git a/src/add-ons/kernel/drivers/network/sis900/dev/mii/icsphyreg.h b/src/add-ons/kernel/drivers/network/sis900/dev/mii/icsphyreg.h index d92d0b51ec..d1cfde5dfd 100644 --- a/src/add-ons/kernel/drivers/network/sis900/dev/mii/icsphyreg.h +++ b/src/add-ons/kernel/drivers/network/sis900/dev/mii/icsphyreg.h @@ -1,6 +1,8 @@ /* $NetBSD: icsphyreg.h,v 1.2 2003/07/01 22:46:08 msaitoh 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/icsphyreg.h 326255 2017-11-27 14:52:40Z pfg $ */ #ifndef _DEV_MII_ICSPHYREG_H_ diff --git a/src/add-ons/kernel/drivers/network/sis900/dev/mii/nsphyter.c b/src/add-ons/kernel/drivers/network/sis900/dev/mii/nsphyter.c index 00c0550a8c..8af26e9766 100644 --- a/src/add-ons/kernel/drivers/network/sis900/dev/mii/nsphyter.c +++ b/src/add-ons/kernel/drivers/network/sis900/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/sis900/dev/mii/nsphyterreg.h b/src/add-ons/kernel/drivers/network/sis900/dev/mii/nsphyterreg.h index 3bf5208ab9..682c550083 100644 --- a/src/add-ons/kernel/drivers/network/sis900/dev/mii/nsphyterreg.h +++ b/src/add-ons/kernel/drivers/network/sis900/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/sis900/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/sis900/dev/mii/ukphy.c index a4004afdb5..ea101c4ba4 100644 --- a/src/add-ons/kernel/drivers/network/sis900/dev/mii/ukphy.c +++ b/src/add-ons/kernel/drivers/network/sis900/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: releng/11.1/sys/dev/mii/ukphy.c 257184 2013-10-26 18:40:17Z glebius $"); +__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/sis900/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/sis900/dev/mii/ukphy_subr.c index f78b4e5e3b..e3d88c96c9 100644 --- a/src/add-ons/kernel/drivers/network/sis900/dev/mii/ukphy_subr.c +++ b/src/add-ons/kernel/drivers/network/sis900/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: releng/11.1/sys/dev/mii/ukphy_subr.c 215297 2010-11-14 13:26:10Z marius $"); +__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/sis900/dev/sis/if_sis.c b/src/add-ons/kernel/drivers/network/sis900/dev/sis/if_sis.c index fbd8a0adbb..8d63427471 100644 --- a/src/add-ons/kernel/drivers/network/sis900/dev/sis/if_sis.c +++ b/src/add-ons/kernel/drivers/network/sis900/dev/sis/if_sis.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 2005 Poul-Henning Kamp * Copyright (c) 1997, 1998, 1999 * Bill Paul . All rights reserved. @@ -32,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/sis/if_sis.c 333813 2018-05-18 20:13:34Z mmacy $"); /* * SiS 900/SiS 7016 fast ethernet PCI NIC driver. Datasheets are diff --git a/src/add-ons/kernel/drivers/network/sis900/dev/sis/if_sisreg.h b/src/add-ons/kernel/drivers/network/sis900/dev/sis/if_sisreg.h index bbadabea26..6bcfd2b34b 100644 --- a/src/add-ons/kernel/drivers/network/sis900/dev/sis/if_sisreg.h +++ b/src/add-ons/kernel/drivers/network/sis900/dev/sis/if_sisreg.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 1997, 1998, 1999 * 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/sis/if_sisreg.h 325966 2017-11-18 14:26:50Z pfg $ */ /* diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/brgphyreg.h b/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/brgphyreg.h index b3535d59fb..aeed8e1661 100644 --- a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/brgphyreg.h +++ b/src/add-ons/kernel/drivers/network/syskonnect/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/syskonnect/dev/mii/e1000phy.c b/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/e1000phy.c index d97c7d5986..f60cfeb503 100644 --- a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/e1000phy.c +++ b/src/add-ons/kernel/drivers/network/syskonnect/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/syskonnect/dev/mii/e1000phyreg.h b/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/e1000phyreg.h index e5d5cf961a..71dba72870 100644 --- a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/e1000phyreg.h +++ b/src/add-ons/kernel/drivers/network/syskonnect/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/syskonnect/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/ukphy.c index 45addcbc75..ea101c4ba4 100644 --- a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/ukphy.c +++ b/src/add-ons/kernel/drivers/network/syskonnect/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/syskonnect/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/ukphy_subr.c index 5f2f6341ba..e3d88c96c9 100644 --- a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/ukphy_subr.c +++ b/src/add-ons/kernel/drivers/network/syskonnect/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/syskonnect/dev/mii/xmphy.c b/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/xmphy.c index 8c35aa5cf7..da86ca2bcd 100644 --- a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/xmphy.c +++ b/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/xmphy.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 2000 * Bill Paul . All rights reserved. * @@ -31,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/mii/xmphy.c 325966 2017-11-18 14:26:50Z pfg $"); /* * driver for the XaQti XMAC II's internal PHY. This is sort of diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/xmphyreg.h b/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/xmphyreg.h index 92b9f78b46..1fa06950d4 100644 --- a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/xmphyreg.h +++ b/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/xmphyreg.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/xmphyreg.h 325966 2017-11-18 14:26:50Z pfg $ */ #ifndef _DEV_MII_XMPHYREG_H_ diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/if_sk.c b/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/if_sk.c index 7e787e8e04..b62812a351 100644 --- a/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/if_sk.c +++ b/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/if_sk.c @@ -1,6 +1,8 @@ /* $OpenBSD: if_sk.c,v 2.33 2003/08/12 05:23:06 nate Exp $ */ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 1997, 1998, 1999, 2000 * Bill Paul . All rights reserved. * @@ -48,21 +50,21 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/sk/if_sk.c 336757 2018-07-27 10:40:48Z eadler $"); /* * SysKonnect SK-NET gigabit ethernet driver for FreeBSD. Supports * the SK-984x series adapters, both single port and dual port. * References: * The XaQti XMAC II datasheet, - * http://www.freebsd.org/~wpaul/SysKonnect/xmacii_datasheet_rev_c_9-29.pdf + * https://www.freebsd.org/~wpaul/SysKonnect/xmacii_datasheet_rev_c_9-29.pdf * The SysKonnect GEnesis manual, http://www.syskonnect.com * * Note: XaQti has been acquired by Vitesse, and Vitesse does not have the * XMAC II datasheet online. I have put my copy at people.freebsd.org as a * convenience to others until Vitesse corrects this problem: * - * http://people.freebsd.org/~wpaul/SysKonnect/xmacii_datasheet_rev_c_9-29.pdf + * https://people.freebsd.org/~wpaul/SysKonnect/xmacii_datasheet_rev_c_9-29.pdf * * Written by Bill Paul * Department of Electrical Engineering @@ -263,7 +265,7 @@ static int sysctl_hw_sk_int_mod(SYSCTL_HANDLER_ARGS); /* Tunables. */ static int jumbo_disable = 0; TUNABLE_INT("hw.skc.jumbo_disable", &jumbo_disable); - + #ifdef __HAIKU__ static u_short in_addword(u_short a, u_short b); #endif diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/if_skreg.h b/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/if_skreg.h index edeff66e37..236fac8306 100644 --- a/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/if_skreg.h +++ b/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/if_skreg.h @@ -1,6 +1,8 @@ /* $OpenBSD: if_skreg.h,v 1.10 2003/08/12 05:23:06 nate Exp $ */ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 1997, 1998, 1999, 2000 * Bill Paul . All rights reserved. * @@ -31,7 +33,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/sk/if_skreg.h 325966 2017-11-18 14:26:50Z pfg $ */ /*- diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/xmaciireg.h b/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/xmaciireg.h index 604073b72a..9ef9169ce1 100644 --- a/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/xmaciireg.h +++ b/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/xmaciireg.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 1997, 1998, 1999, 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/sk/xmaciireg.h 325966 2017-11-18 14:26:50Z pfg $ */ /* diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/yukonreg.h b/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/yukonreg.h index 33ca8b2ae3..8dc163c11c 100644 --- a/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/yukonreg.h +++ b/src/add-ons/kernel/drivers/network/syskonnect/dev/sk/yukonreg.h @@ -14,7 +14,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/sk/yukonreg.h 298955 2016-05-03 03:41:25Z pfg $ */ /* General Purpose Status Register (GPSR) */ diff --git a/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ciphy.c b/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ciphy.c index 3ecd360bed..d064dfe156 100644 --- a/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ciphy.c +++ b/src/add-ons/kernel/drivers/network/via_rhine/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: releng/11.1/sys/dev/mii/ciphy.c 277093 2015-01-12 22:27:38Z glebius $"); +__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/via_rhine/dev/mii/ciphyreg.h b/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ciphyreg.h index 20b953a35b..4ba2444eda 100644 --- a/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ciphyreg.h +++ b/src/add-ons/kernel/drivers/network/via_rhine/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: releng/11.1/sys/dev/mii/ciphyreg.h 220938 2011-04-22 09:22:27Z marius $ + * $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/via_rhine/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ukphy.c index a4004afdb5..ea101c4ba4 100644 --- a/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ukphy.c +++ b/src/add-ons/kernel/drivers/network/via_rhine/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: releng/11.1/sys/dev/mii/ukphy.c 257184 2013-10-26 18:40:17Z glebius $"); +__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/via_rhine/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ukphy_subr.c index f78b4e5e3b..e3d88c96c9 100644 --- a/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ukphy_subr.c +++ b/src/add-ons/kernel/drivers/network/via_rhine/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: releng/11.1/sys/dev/mii/ukphy_subr.c 215297 2010-11-14 13:26:10Z marius $"); +__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/via_rhine/dev/vr/if_vr.c b/src/add-ons/kernel/drivers/network/via_rhine/dev/vr/if_vr.c index 3bda546a68..688c92f3a9 100644 --- a/src/add-ons/kernel/drivers/network/via_rhine/dev/vr/if_vr.c +++ b/src/add-ons/kernel/drivers/network/via_rhine/dev/vr/if_vr.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 1997, 1998 * Bill Paul . All rights reserved. * @@ -31,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: releng/11.1/sys/dev/vr/if_vr.c 296272 2016-03-01 17:47:32Z jhb $"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/vr/if_vr.c 333813 2018-05-18 20:13:34Z mmacy $"); /* * VIA Rhine fast ethernet PCI NIC driver diff --git a/src/add-ons/kernel/drivers/network/via_rhine/dev/vr/if_vrreg.h b/src/add-ons/kernel/drivers/network/via_rhine/dev/vr/if_vrreg.h index c6029a8765..fa3a7cf5ce 100644 --- a/src/add-ons/kernel/drivers/network/via_rhine/dev/vr/if_vrreg.h +++ b/src/add-ons/kernel/drivers/network/via_rhine/dev/vr/if_vrreg.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 1997, 1998 * 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: releng/11.1/sys/dev/vr/if_vrreg.h 235334 2012-05-12 14:37:25Z rpaulo $ + * $FreeBSD: releng/12.0/sys/dev/vr/if_vrreg.h 325966 2017-11-18 14:26:50Z pfg $ */ /* diff --git a/src/add-ons/kernel/drivers/network/vt612x/dev/mii/ciphy.c b/src/add-ons/kernel/drivers/network/vt612x/dev/mii/ciphy.c index 2d2816cddf..d064dfe156 100644 --- a/src/add-ons/kernel/drivers/network/vt612x/dev/mii/ciphy.c +++ b/src/add-ons/kernel/drivers/network/vt612x/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/vt612x/dev/mii/ciphyreg.h b/src/add-ons/kernel/drivers/network/vt612x/dev/mii/ciphyreg.h index dd73f87783..4ba2444eda 100644 --- a/src/add-ons/kernel/drivers/network/vt612x/dev/mii/ciphyreg.h +++ b/src/add-ons/kernel/drivers/network/vt612x/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/vt612x/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/vt612x/dev/mii/ukphy.c index 45addcbc75..ea101c4ba4 100644 --- a/src/add-ons/kernel/drivers/network/vt612x/dev/mii/ukphy.c +++ b/src/add-ons/kernel/drivers/network/vt612x/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/vt612x/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/vt612x/dev/mii/ukphy_subr.c index 5f2f6341ba..e3d88c96c9 100644 --- a/src/add-ons/kernel/drivers/network/vt612x/dev/mii/ukphy_subr.c +++ b/src/add-ons/kernel/drivers/network/vt612x/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/vt612x/dev/vge/if_vge.c b/src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vge.c index 315f273eef..b9d88f7e07 100644 --- a/src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vge.c +++ b/src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vge.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/vge/if_vge.c 333813 2018-05-18 20:13:34Z mmacy $"); /* * VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver. diff --git a/src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vgereg.h b/src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vgereg.h index c8b3f1bb45..6df5d99606 100644 --- a/src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vgereg.h +++ b/src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vgereg.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/vge/if_vgereg.h 325966 2017-11-18 14:26:50Z pfg $ */ /* diff --git a/src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vgevar.h b/src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vgevar.h index ca899cc5fc..b95ba24425 100644 --- a/src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vgevar.h +++ b/src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vgevar.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/vge/if_vgevar.h 325966 2017-11-18 14:26:50Z pfg $ */ #define VGE_JUMBO_MTU 9000