hrev52714 adds 4 changesets to branch 'master'
old head: 2afe8644cf7f7635e44d01116387a7c54bbf1401
new head: a29a8f98ed238d66c21b63028e91e6a7f6ef04cf
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=a29a8f98ed23+%5E2afe8644cf7f
----------------------------------------------------------------------------
2b5a056e0324: drivers/network: Upgrade jmicron2x0, marvell_yukon, nforce,
pcnet, rdc to FreeBSD 12.
No real functional change in these.
6d2ae71f16e4: drivers/network: Upgrade rtl8139, rtl81xx to FreeBSD 12.
Includes some logic fixes to Haiku-specific code in the MII drivers,
and one new chipset supported by the rtl81xx MII driver. Otherwise,
no major functional change.
eababbb4cf46: drivers/network: Upgrade sis900, syskonnect, via_rhine, vt612x to
FreeBSD 12.
No real functional change.
a29a8f98ed23: drivers/network: Mark all FreeBSD ethernet drivers as upgraded to
12.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
85 files changed, 371 insertions(+), 136 deletions(-)
src/add-ons/kernel/drivers/network/Jamfile | 8 +-
.../drivers/network/jmicron2x0/dev/jme/if_jme.c | 38 +++++----
.../network/jmicron2x0/dev/jme/if_jmereg.h | 4 +-
.../network/jmicron2x0/dev/jme/if_jmevar.h | 4 +-
.../drivers/network/jmicron2x0/dev/mii/jmphy.c | 4 +-
.../network/jmicron2x0/dev/mii/jmphyreg.h | 4 +-
.../network/marvell_yukon/dev/mii/brgphyreg.h | 4 +-
.../network/marvell_yukon/dev/mii/e1000phy.c | 4 +-
.../network/marvell_yukon/dev/mii/e1000phyreg.h | 4 +-
.../network/marvell_yukon/dev/mii/ukphy.c | 4 +-
.../network/marvell_yukon/dev/mii/ukphy_subr.c | 4 +-
.../network/marvell_yukon/dev/msk/if_msk.c | 6 +-
.../network/marvell_yukon/dev/msk/if_mskreg.h | 4 +-
.../kernel/drivers/network/marvell_yukon/glue.c | 4 +-
.../drivers/network/nforce/dev/mii/ciphy.c | 4 +-
.../drivers/network/nforce/dev/mii/ciphyreg.h | 4 +-
.../drivers/network/nforce/dev/mii/ukphy.c | 4 +-
.../drivers/network/nforce/dev/mii/ukphy_subr.c | 4 +-
.../drivers/network/nforce/dev/nfe/if_nfe.c | 2 +-
.../drivers/network/nforce/dev/nfe/if_nfereg.h | 2 +-
.../drivers/network/nforce/dev/nfe/if_nfevar.h | 2 +-
.../kernel/drivers/network/pcnet/dev/le/am7990.c | 4 +-
.../drivers/network/pcnet/dev/le/am79900.c | 8 +-
.../drivers/network/pcnet/dev/le/am79900reg.h | 4 +-
.../drivers/network/pcnet/dev/le/am79900var.h | 4 +-
.../drivers/network/pcnet/dev/le/am7990reg.h | 4 +-
.../drivers/network/pcnet/dev/le/am7990var.h | 4 +-
.../drivers/network/pcnet/dev/le/if_le_ledma.c | 4 +-
.../drivers/network/pcnet/dev/le/if_le_pci.c | 4 +-
.../kernel/drivers/network/pcnet/dev/le/lance.c | 4 +-
.../drivers/network/pcnet/dev/le/lancereg.h | 4 +-
.../drivers/network/pcnet/dev/le/lancevar.h | 4 +-
.../kernel/drivers/network/pcnet/dev/mii/nsphy.c | 4 +-
.../drivers/network/pcnet/dev/mii/nsphyreg.h | 4 +-
.../drivers/network/pcnet/dev/mii/nsphyter.c | 4 +-
.../drivers/network/pcnet/dev/mii/nsphyterreg.h | 4 +-
.../kernel/drivers/network/pcnet/dev/mii/ukphy.c | 4 +-
.../drivers/network/pcnet/dev/mii/ukphy_subr.c | 4 +-
.../drivers/network/pcnet/dev/pcn/if_pcn.c | 8 +-
.../drivers/network/pcnet/dev/pcn/if_pcnreg.h | 4 +-
.../kernel/drivers/network/rdc/dev/mii/rdcphy.c | 6 +-
.../drivers/network/rdc/dev/mii/rdcphyreg.h | 4 +-
.../kernel/drivers/network/rdc/dev/vte/if_vte.c | 4 +-
.../drivers/network/rdc/dev/vte/if_vtereg.h | 4 +-
.../drivers/network/rdc/dev/vte/if_vtevar.h | 4 +-
.../drivers/network/rtl8139/dev/mii/rlphy.c | 13 +--
.../drivers/network/rtl8139/dev/rl/if_rl.c | 12 +--
.../drivers/network/rtl8139/dev/rl/if_rlreg.h | 2 +-
.../drivers/network/rtl81xx/dev/mii/rgephy.c | 16 +++-
.../drivers/network/rtl81xx/dev/mii/rgephyreg.h | 7 +-
.../drivers/network/rtl81xx/dev/mii/rlphy.c | 13 +--
.../drivers/network/rtl81xx/dev/re/if_re.c | 86 ++++++++++++++++++--
.../drivers/network/rtl81xx/dev/rl/if_rlreg.h | 2 +-
.../drivers/network/sis900/dev/mii/icsphy.c | 4 +-
.../drivers/network/sis900/dev/mii/icsphyreg.h | 4 +-
.../drivers/network/sis900/dev/mii/nsphyter.c | 4 +-
.../drivers/network/sis900/dev/mii/nsphyterreg.h | 4 +-
.../drivers/network/sis900/dev/mii/ukphy.c | 4 +-
.../drivers/network/sis900/dev/mii/ukphy_subr.c | 4 +-
.../drivers/network/sis900/dev/sis/if_sis.c | 4 +-
.../drivers/network/sis900/dev/sis/if_sisreg.h | 4 +-
.../network/syskonnect/dev/mii/brgphyreg.h | 4 +-
.../network/syskonnect/dev/mii/e1000phy.c | 4 +-
.../network/syskonnect/dev/mii/e1000phyreg.h | 4 +-
.../drivers/network/syskonnect/dev/mii/ukphy.c | 4 +-
.../network/syskonnect/dev/mii/ukphy_subr.c | 4 +-
.../drivers/network/syskonnect/dev/mii/xmphy.c | 4 +-
.../network/syskonnect/dev/mii/xmphyreg.h | 4 +-
.../drivers/network/syskonnect/dev/sk/if_sk.c | 10 ++-
.../drivers/network/syskonnect/dev/sk/if_skreg.h | 4 +-
.../network/syskonnect/dev/sk/xmaciireg.h | 4 +-
.../drivers/network/syskonnect/dev/sk/yukonreg.h | 2 +-
.../drivers/network/via_rhine/dev/mii/ciphy.c | 4 +-
.../drivers/network/via_rhine/dev/mii/ciphyreg.h | 4 +-
.../drivers/network/via_rhine/dev/mii/ukphy.c | 4 +-
.../network/via_rhine/dev/mii/ukphy_subr.c | 4 +-
.../drivers/network/via_rhine/dev/vr/if_vr.c | 4 +-
.../drivers/network/via_rhine/dev/vr/if_vrreg.h | 4 +-
.../drivers/network/vt612x/dev/mii/ciphy.c | 4 +-
.../drivers/network/vt612x/dev/mii/ciphyreg.h | 4 +-
.../drivers/network/vt612x/dev/mii/ukphy.c | 4 +-
.../drivers/network/vt612x/dev/mii/ukphy_subr.c | 4 +-
.../drivers/network/vt612x/dev/vge/if_vge.c | 4 +-
.../drivers/network/vt612x/dev/vge/if_vgereg.h | 4 +-
.../drivers/network/vt612x/dev/vge/if_vgevar.h | 4 +-
############################################################################
Commit: 2b5a056e03241bd4dfd6dc9ff9b8892fe45cd209
URL: https://git.haiku-os.org/haiku/commit/?id=2b5a056e0324
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sat Jan 5 02:11:24 2019 UTC
drivers/network: Upgrade jmicron2x0, marvell_yukon, nforce, pcnet, rdc to
FreeBSD 12.
No real functional change in these.
----------------------------------------------------------------------------
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 <yongari@xxxxxxxxxxx>
* All rights reserved.
*
@@ -26,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__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 <sys/param.h>
#include <sys/systm.h>
@@ -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 <yongari@xxxxxxxxxxx>
* 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 <yongari@xxxxxxxxxxx>
* 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 <yongari@xxxxxxxxxxx>
* All rights reserved.
*
@@ -26,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__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 <wpaul@xxxxxxxxxxxxxxx>. 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 <sys/cdefs.h>
-__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 <sys/cdefs.h>
-__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 <sys/cdefs.h>
-__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 <wpaul@xxxxxxxxxxxxxxxx>. All rights reserved.
*
@@ -99,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: releng/12.0/sys/dev/msk/if_msk.c 333813 2018-05-18
20:13:34Z mmacy $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -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 <wpaul@xxxxxxxxxxxxxxxx>. 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 <dev/msk/if_mskreg.h>
+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 <wpaul@xxxxxxxxxxxxx>. All rights reserved.
*
@@ -31,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__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 <wpaul@xxxxxxxxxxxxx>. 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 <sys/cdefs.h>
-__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 <sys/cdefs.h>
-__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 <sys/cdefs.h>
-__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 <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: releng/12.0/sys/dev/le/am7990.c 326255 2017-11-27
14:52:40Z pfg $");
#include <sys/param.h>
#include <sys/bus.h>
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 <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: releng/12.0/sys/dev/le/am79900.c 326255 2017-11-27
14:52:40Z pfg $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -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 <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: releng/12.0/sys/dev/le/if_le_ledma.c 326255 2017-11-27
14:52:40Z pfg $");
#include <sys/param.h>
#include <sys/systm.h>
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 <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: releng/12.0/sys/dev/le/if_le_pci.c 326255 2017-11-27
14:52:40Z pfg $");
#include <sys/param.h>
#include <sys/systm.h>
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 <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: releng/12.0/sys/dev/le/lance.c 333813 2018-05-18 20:13:34Z
mmacy $");
#include <sys/param.h>
#include <sys/bus.h>
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 <sys/cdefs.h>
-__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 <sys/cdefs.h>
-__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 <sys/cdefs.h>
-__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 <sys/cdefs.h>
-__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 <wpaul@xxxxxxxxxxxx>. All rights reserved.
@@ -32,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__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 <wpaul@xxxxxxxxxxxxxxx>. 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 <yongari@xxxxxxxxxxx>
* All rights reserved.
*
@@ -26,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__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 <yongari@xxxxxxxxxxx>
* 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 <yongari@xxxxxxxxxxx>
* All rights reserved.
*
@@ -28,7 +30,7 @@
/* Driver for DM&P Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: releng/12.0/sys/dev/vte/if_vte.c 333813 2018-05-18
20:13:34Z mmacy $");
#include <sys/param.h>
#include <sys/systm.h>
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 <yongari@xxxxxxxxxxx>
* 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 <yongari@xxxxxxxxxxx>
* 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
############################################################################
Commit: 6d2ae71f16e4d587ac876337425cb7edb6620f22
URL: https://git.haiku-os.org/haiku/commit/?id=6d2ae71f16e4
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sat Jan 5 02:13:33 2019 UTC
drivers/network: Upgrade rtl8139, rtl81xx to FreeBSD 12.
Includes some logic fixes to Haiku-specific code in the MII drivers,
and one new chipset supported by the rtl81xx MII driver. Otherwise,
no major functional change.
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/network/rtl8139/dev/mii/rlphy.c
b/src/add-ons/kernel/drivers/network/rtl8139/dev/mii/rlphy.c
index 2afd3e0ecc..8185872b1b 100644
--- a/src/add-ons/kernel/drivers/network/rtl8139/dev/mii/rlphy.c
+++ b/src/add-ons/kernel/drivers/network/rtl8139/dev/mii/rlphy.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@xxxxxxxxxxxxxxxx>. All rights reserved.
*
@@ -31,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: releng/12.0/sys/dev/mii/rlphy.c 325966 2017-11-18
14:26:50Z pfg $");
/*
* driver for RealTek 8139 internal PHYs
@@ -111,12 +113,13 @@ rlphy_probe(device_t dev)
int rv;
rv = mii_phy_dev_probe(dev, rlphys, BUS_PROBE_DEFAULT);
-#ifdef __HAIKU__
- if (rv == BUS_PROBE_DEFAULT)
- return (rv);
-#else
+#ifndef __HAIKU__
if (rv <= 0)
return (rv);
+#else /* __HAIKU__ */
+ /* our BUS_PROBE_* constants are > 0 since errors are < 0 */
+ if (rv > 0)
+ return (rv);
#endif
if (mii_dev_mac_match(dev, "rl") || mii_dev_mac_match(dev, "re"))
diff --git a/src/add-ons/kernel/drivers/network/rtl8139/dev/rl/if_rl.c
b/src/add-ons/kernel/drivers/network/rtl8139/dev/rl/if_rl.c
index e32929dadb..a21dcb409c 100644
--- a/src/add-ons/kernel/drivers/network/rtl8139/dev/rl/if_rl.c
+++ b/src/add-ons/kernel/drivers/network/rtl8139/dev/rl/if_rl.c
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: releng/12.0/sys/dev/rl/if_rl.c 338951 2018-09-26 19:41:00Z
imp $");
/*
* RealTek 8129/8139 PCI NIC driver
@@ -259,6 +259,8 @@ static driver_t rl_driver = {
static devclass_t rl_devclass;
DRIVER_MODULE(rl, pci, rl_driver, rl_devclass, 0, 0);
+MODULE_PNP_INFO("U16:vendor;U16:device", pci, rl, rl_devs,
+ nitems(rl_devs) - 1);
DRIVER_MODULE(rl, cardbus, rl_driver, rl_devclass, 0, 0);
DRIVER_MODULE(miibus, rl, miibus_driver, miibus_devclass, 0, 0);
@@ -276,7 +278,7 @@ DRIVER_MODULE(miibus, rl, miibus_driver, miibus_devclass,
0, 0);
static void
rl_eeprom_putbyte(struct rl_softc *sc, int addr)
{
- register int d, i;
+ int d, i;
d = addr | sc->rl_eecmd_read;
@@ -303,7 +305,7 @@ rl_eeprom_putbyte(struct rl_softc *sc, int addr)
static void
rl_eeprom_getword(struct rl_softc *sc, int addr, uint16_t *dest)
{
- register int i;
+ int i;
uint16_t word = 0;
/* Enter EEPROM access mode. */
@@ -561,7 +563,7 @@ rl_rxfilter(struct rl_softc *sc)
static void
rl_reset(struct rl_softc *sc)
{
- register int i;
+ int i;
RL_LOCK_ASSERT(sc);
@@ -1912,7 +1914,7 @@ rl_watchdog(struct rl_softc *sc)
static void
rl_stop(struct rl_softc *sc)
{
- register int i;
+ int i;
struct ifnet *ifp = sc->rl_ifp;
RL_LOCK_ASSERT(sc);
diff --git a/src/add-ons/kernel/drivers/network/rtl8139/dev/rl/if_rlreg.h
b/src/add-ons/kernel/drivers/network/rtl8139/dev/rl/if_rlreg.h
index 2fa44efa2f..0910bce34d 100644
--- a/src/add-ons/kernel/drivers/network/rtl8139/dev/rl/if_rlreg.h
+++ b/src/add-ons/kernel/drivers/network/rtl8139/dev/rl/if_rlreg.h
@@ -29,7 +29,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/rl/if_rlreg.h 306102 2016-09-21 14:15:15Z
kevlo $
*/
/*
diff --git a/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/rgephy.c
b/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/rgephy.c
index bb60fa92fe..7d920e6077 100644
--- a/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/rgephy.c
+++ b/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/rgephy.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@xxxxxxxxxxxxx>. All rights reserved.
*
@@ -31,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: releng/12.0/sys/dev/mii/rgephy.c 325966 2017-11-18
14:26:50Z pfg $");
/*
* Driver for the RealTek 8169S/8110S/8211B/8211C internal 10/100/1000 PHY.
@@ -121,6 +123,8 @@ rgephy_attach(device_t dev)
flags = 0;
if (mii_dev_mac_match(dev, "re"))
flags |= MIIF_PHYPRIV0;
+ else if (mii_dev_mac_match(dev, "ure"))
+ flags |= MIIF_PHYPRIV1;
mii_phy_dev_attach(dev, flags, &rgephy_funcs, 0);
/* RTL8169S do not report auto-sense; add manually. */
@@ -293,7 +297,10 @@ rgephy_linkup(struct mii_softc *sc)
linkup++;
}
} else {
- reg = PHY_READ(sc, RL_GMEDIASTAT);
+ if (sc->mii_flags & MIIF_PHYPRIV1)
+ reg = PHY_READ(sc, URE_GMEDIASTAT);
+ else
+ reg = PHY_READ(sc, RL_GMEDIASTAT);
if (reg & RL_GMEDIASTAT_LINK)
linkup++;
}
@@ -378,7 +385,10 @@ rgephy_status(struct mii_softc *sc)
mii->mii_media_active |= IFM_HDX;
}
} else {
- bmsr = PHY_READ(sc, RL_GMEDIASTAT);
+ if (sc->mii_flags & MIIF_PHYPRIV1)
+ bmsr = PHY_READ(sc, URE_GMEDIASTAT);
+ else
+ bmsr = PHY_READ(sc, RL_GMEDIASTAT);
if (bmsr & RL_GMEDIASTAT_1000MBPS)
mii->mii_media_active |= IFM_1000_T;
else if (bmsr & RL_GMEDIASTAT_100MBPS)
diff --git a/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/rgephyreg.h
b/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/rgephyreg.h
index 7c24a1f7cb..855aea5239 100644
--- a/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/rgephyreg.h
+++ b/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/rgephyreg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@xxxxxxxxxxxxx>. 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/rgephyreg.h 325966 2017-11-18 14:26:50Z
pfg $
*/
#ifndef _DEV_MII_RGEPHYREG_H_
@@ -199,4 +201,7 @@
#define EEELPAR_1000T 0x0004 /* link partner 1000baseT EEE
capable */
#define EEELPAR_100TX 0x0002 /* link partner 100baseTX EEE
capable */
+/* RTL8153 */
+#define URE_GMEDIASTAT 0xe908 /* media status register */
+
#endif /* _DEV_RGEPHY_MIIREG_H_ */
diff --git a/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/rlphy.c
b/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/rlphy.c
index 2afd3e0ecc..8185872b1b 100644
--- a/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/rlphy.c
+++ b/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/rlphy.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@xxxxxxxxxxxxxxxx>. All rights reserved.
*
@@ -31,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: releng/12.0/sys/dev/mii/rlphy.c 325966 2017-11-18
14:26:50Z pfg $");
/*
* driver for RealTek 8139 internal PHYs
@@ -111,12 +113,13 @@ rlphy_probe(device_t dev)
int rv;
rv = mii_phy_dev_probe(dev, rlphys, BUS_PROBE_DEFAULT);
-#ifdef __HAIKU__
- if (rv == BUS_PROBE_DEFAULT)
- return (rv);
-#else
+#ifndef __HAIKU__
if (rv <= 0)
return (rv);
+#else /* __HAIKU__ */
+ /* our BUS_PROBE_* constants are > 0 since errors are < 0 */
+ if (rv > 0)
+ return (rv);
#endif
if (mii_dev_mac_match(dev, "rl") || mii_dev_mac_match(dev, "re"))
diff --git a/src/add-ons/kernel/drivers/network/rtl81xx/dev/re/if_re.c
b/src/add-ons/kernel/drivers/network/rtl81xx/dev/re/if_re.c
index 071b55b101..a779c31ec4 100644
--- a/src/add-ons/kernel/drivers/network/rtl81xx/dev/re/if_re.c
+++ b/src/add-ons/kernel/drivers/network/rtl81xx/dev/re/if_re.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998-2003
* Bill Paul <wpaul@xxxxxxxxxxxxx>. All rights reserved.
*
@@ -31,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: releng/12.0/sys/dev/re/if_re.c 333813 2018-05-18 20:13:34Z
mmacy $");
/*
* RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver
@@ -137,6 +139,8 @@ __FBSDID("$FreeBSD$");
#include <net/bpf.h>
+#include <netinet/netdump/netdump.h>
+
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
@@ -277,6 +281,7 @@ static void re_tick (void *);
static void re_int_task (void *, int);
static void re_start (struct ifnet *);
static void re_start_locked (struct ifnet *);
+static void re_start_tx (struct rl_softc *);
static int re_ioctl (struct ifnet *, u_long, caddr_t);
static void re_init (void *);
static void re_init_locked (struct rl_softc *);
@@ -305,6 +310,8 @@ static void re_setwol (struct rl_softc *);
static void re_clrwol (struct rl_softc *);
static void re_set_linkspeed (struct rl_softc *);
+NETDUMP_DEFINE(re);
+
#ifdef DEV_NETMAP /* see ixgbe.c for details */
#include <dev/netmap/if_re_netmap.h>
MODULE_DEPEND(re, netmap, 1, 1, 1);
@@ -1358,15 +1365,17 @@ re_attach(device_t dev)
CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_OFF);
}
- /* Disable ASPM L0S/L1. */
+ /* Disable ASPM L0S/L1 and CLKREQ. */
if (sc->rl_expcap != 0) {
cap = pci_read_config(dev, sc->rl_expcap +
PCIER_LINK_CAP, 2);
if ((cap & PCIEM_LINK_CAP_ASPM) != 0) {
ctl = pci_read_config(dev, sc->rl_expcap +
PCIER_LINK_CTL, 2);
- if ((ctl & PCIEM_LINK_CTL_ASPMC) != 0) {
- ctl &= ~PCIEM_LINK_CTL_ASPMC;
+ if ((ctl & (PCIEM_LINK_CTL_ECPM |
+ PCIEM_LINK_CTL_ASPMC))!= 0) {
+ ctl &= ~(PCIEM_LINK_CTL_ECPM |
+ PCIEM_LINK_CTL_ASPMC);
pci_write_config(dev, sc->rl_expcap +
PCIER_LINK_CTL, ctl, 2);
device_printf(dev, "ASPM disabled\n");
@@ -1733,8 +1742,11 @@ re_attach(device_t dev)
if (error) {
device_printf(dev, "couldn't set up irq\n");
ether_ifdetach(ifp);
+ goto fail;
}
+ NETDUMP_SET(ifp, re);
+
fail:
if (error)
re_detach(dev);
@@ -2929,7 +2941,7 @@ re_start_locked(struct ifnet *ifp)
#ifdef DEV_NETMAP
/* XXX is this necessary ? */
if (ifp->if_capenable & IFCAP_NETMAP) {
- struct netmap_kring *kring = &NA(ifp)->tx_rings[0];
+ struct netmap_kring *kring = NA(ifp)->tx_rings[0];
if (sc->rl_ldata.rl_tx_prodidx != kring->nr_hwcur) {
/* kick the tx unit */
CSR_WRITE_1(sc, sc->rl_txstart, RL_TXSTART_START);
@@ -2977,8 +2989,14 @@ re_start_locked(struct ifnet *ifp)
return;
}
- /* Flush the TX descriptors */
+ re_start_tx(sc);
+}
+
+static void
+re_start_tx(struct rl_softc *sc)
+{
+ /* Flush the TX descriptors */
bus_dmamap_sync(sc->rl_ldata.rl_tx_list_tag,
sc->rl_ldata.rl_tx_list_map,
BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD);
@@ -4074,3 +4092,59 @@ sysctl_hw_re_int_mod(SYSCTL_HANDLER_ARGS)
return (sysctl_int_range(oidp, arg1, arg2, req, RL_TIMER_MIN,
RL_TIMER_MAX));
}
+
+#ifdef NETDUMP
+static void
+re_netdump_init(struct ifnet *ifp, int *nrxr, int *ncl, int *clsize)
+{
+ struct rl_softc *sc;
+
+ sc = if_getsoftc(ifp);
+ RL_LOCK(sc);
+ *nrxr = sc->rl_ldata.rl_rx_desc_cnt;
+ *ncl = NETDUMP_MAX_IN_FLIGHT;
+ *clsize = (ifp->if_mtu > RL_MTU &&
+ (sc->rl_flags & RL_FLAG_JUMBOV2) != 0) ? MJUM9BYTES : MCLBYTES;
+ RL_UNLOCK(sc);
+}
+
+static void
+re_netdump_event(struct ifnet *ifp __unused, enum netdump_ev event __unused)
+{
+}
+
+static int
+re_netdump_transmit(struct ifnet *ifp, struct mbuf *m)
+{
+ struct rl_softc *sc;
+ int error;
+
+ sc = if_getsoftc(ifp);
+ if ((if_getdrvflags(ifp) & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) !=
+ IFF_DRV_RUNNING || (sc->rl_flags & RL_FLAG_LINK) == 0)
+ return (EBUSY);
+
+ error = re_encap(sc, &m);
+ if (error == 0)
+ re_start_tx(sc);
+ return (error);
+}
+
+static int
+re_netdump_poll(struct ifnet *ifp, int count)
+{
+ struct rl_softc *sc;
+ int error;
+
+ sc = if_getsoftc(ifp);
+ if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0 ||
+ (sc->rl_flags & RL_FLAG_LINK) == 0)
+ return (EBUSY);
+
+ re_txeof(sc);
+ error = re_rxeof(sc, NULL);
+ if (error != 0 && error != EAGAIN)
+ return (error);
+ return (0);
+}
+#endif /* NETDUMP */
diff --git a/src/add-ons/kernel/drivers/network/rtl81xx/dev/rl/if_rlreg.h
b/src/add-ons/kernel/drivers/network/rtl81xx/dev/rl/if_rlreg.h
index 2fa44efa2f..0910bce34d 100644
--- a/src/add-ons/kernel/drivers/network/rtl81xx/dev/rl/if_rlreg.h
+++ b/src/add-ons/kernel/drivers/network/rtl81xx/dev/rl/if_rlreg.h
@@ -29,7 +29,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/rl/if_rlreg.h 306102 2016-09-21 14:15:15Z
kevlo $
*/
/*
############################################################################
Commit: eababbb4cf46a709dec2c130ea69c4542934d1ff
URL: https://git.haiku-os.org/haiku/commit/?id=eababbb4cf46
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sat Jan 5 02:15:15 2019 UTC
drivers/network: Upgrade sis900, syskonnect, via_rhine, vt612x to FreeBSD 12.
No real functional change.
----------------------------------------------------------------------------
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 <sys/cdefs.h>
-__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 <sys/cdefs.h>
-__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 <sys/cdefs.h>
-__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 <sys/cdefs.h>
-__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 <phk@xxxxxxxxxxx>
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@xxxxxxxxxxxxxxxx>. All rights reserved.
@@ -32,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__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 <wpaul@xxxxxxxxxxxxxxx>. 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 <wpaul@xxxxxxxxxxxxxxx>. 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 <sys/cdefs.h>
-__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 <sys/cdefs.h>
-__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 <sys/cdefs.h>
-__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 <wpaul@xxxxxxxxxxxxxxx>. All rights reserved.
*
@@ -31,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__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 <wpaul@xxxxxxxxxxxxxxx>. 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 <wpaul@xxxxxxxxxxxxxxxx>. All rights reserved.
*
@@ -48,21 +50,21 @@
*/
#include <sys/cdefs.h>
-__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 <wpaul@xxxxxxxxxxxxxxx>
* 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 <wpaul@xxxxxxxxxxxxxxxx>. 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 <wpaul@xxxxxxxxxxxxxxxx>. 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 <wpaul@xxxxxxxxxxxxx>. All rights reserved.
*
@@ -31,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__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 <wpaul@xxxxxxxxxxxxx>. 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 <sys/cdefs.h>
-__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 <sys/cdefs.h>
-__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 <wpaul@xxxxxxxxxxxxxxxx>. All rights reserved.
*
@@ -31,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__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 <wpaul@xxxxxxxxxxxxxxxx>. 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 <wpaul@xxxxxxxxxxxxx>. All rights reserved.
*
@@ -31,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__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 <wpaul@xxxxxxxxxxxxx>. 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 <sys/cdefs.h>
-__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 <sys/cdefs.h>
-__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 <wpaul@xxxxxxxxxxxxx>. All rights reserved.
*
@@ -31,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__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 <wpaul@xxxxxxxxxxxxx>. 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 <wpaul@xxxxxxxxxxxxx>. 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
############################################################################
Revision: hrev52714
Commit: a29a8f98ed238d66c21b63028e91e6a7f6ef04cf
URL: https://git.haiku-os.org/haiku/commit/?id=a29a8f98ed23
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sat Jan 5 02:16:00 2019 UTC
drivers/network: Mark all FreeBSD ethernet drivers as upgraded to 12.
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/network/Jamfile
b/src/add-ons/kernel/drivers/network/Jamfile
index 853ca057c5..a9221c4b38 100644
--- a/src/add-ons/kernel/drivers/network/Jamfile
+++ b/src/add-ons/kernel/drivers/network/Jamfile
@@ -14,7 +14,7 @@ SubInclude HAIKU_TOP src add-ons kernel drivers network
usb_davicom ;
SubInclude HAIKU_TOP src add-ons kernel drivers network usb_ecm ;
SubInclude HAIKU_TOP src add-ons kernel drivers network wb840 ;
-# FreeBSD 11.1 drivers
+# FreeBSD 12 drivers
SubInclude HAIKU_TOP src add-ons kernel drivers network 3com ;
SubInclude HAIKU_TOP src add-ons kernel drivers network ar81xx ;
SubInclude HAIKU_TOP src add-ons kernel drivers network atheros813x ;
@@ -23,6 +23,7 @@ SubInclude HAIKU_TOP src add-ons kernel drivers network
attansic_l2 ;
SubInclude HAIKU_TOP src add-ons kernel drivers network broadcom440x ;
SubInclude HAIKU_TOP src add-ons kernel drivers network broadcom570x ;
SubInclude HAIKU_TOP src add-ons kernel drivers network dec21xxx ;
+SubInclude HAIKU_TOP src add-ons kernel drivers network emulex_oce ;
SubInclude HAIKU_TOP src add-ons kernel drivers network ipro100 ;
SubInclude HAIKU_TOP src add-ons kernel drivers network ipro1000 ;
SubInclude HAIKU_TOP src add-ons kernel drivers network jmicron2x0 ;
@@ -32,10 +33,7 @@ SubInclude HAIKU_TOP src add-ons kernel drivers network
pcnet ;
SubInclude HAIKU_TOP src add-ons kernel drivers network rdc ;
SubInclude HAIKU_TOP src add-ons kernel drivers network rtl8139 ;
SubInclude HAIKU_TOP src add-ons kernel drivers network rtl81xx ;
+SubInclude HAIKU_TOP src add-ons kernel drivers network sis900 ;
SubInclude HAIKU_TOP src add-ons kernel drivers network syskonnect ;
SubInclude HAIKU_TOP src add-ons kernel drivers network via_rhine ;
SubInclude HAIKU_TOP src add-ons kernel drivers network vt612x ;
-
-# FreeBSD 11.2 drivers
-SubInclude HAIKU_TOP src add-ons kernel drivers network emulex_oce ;
-SubInclude HAIKU_TOP src add-ons kernel drivers network sis900 ;
