From 0c3e5b9745568e27ac7384427d69bd3d8cad6f1c Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 27 Dec 2018 16:55:48 -0500 Subject: [PATCH] ipro100: Upgrade to FreeBSD 12. --- .../drivers/network/ipro100/dev/fxp/if_fxp.c | 27 ++++++++++--------- .../network/ipro100/dev/fxp/if_fxpreg.h | 4 ++- .../network/ipro100/dev/fxp/if_fxpvar.h | 4 ++- .../drivers/network/ipro100/dev/fxp/inphy.c | 4 ++- .../network/ipro100/dev/fxp/inphyreg.h | 4 ++- .../network/ipro100/dev/fxp/rcvbundl.h | 4 ++- 6 files changed, 29 insertions(+), 18 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/if_fxp.c b/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/if_fxp.c index 543eba9c91..0b9f37660b 100644 --- a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/if_fxp.c +++ b/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/if_fxp.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * * Copyright (c) 1995, David Greenman * Copyright (c) 2001 Jonathan Lemon * All rights reserved. @@ -28,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/fxp/if_fxp.c 338948 2018-09-26 17:12:14Z imp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver @@ -305,6 +307,8 @@ static devclass_t fxp_devclass; DRIVER_MODULE_ORDERED(fxp, pci, fxp_driver, fxp_devclass, NULL, NULL, SI_ORDER_ANY); +MODULE_PNP_INFO("U16:vendor;U16:device", pci, fxp, fxp_ident_table, + nitems(fxp_ident_table) - 1); DRIVER_MODULE(miibus, fxp, miibus_driver, miibus_devclass, NULL, NULL); static struct resource_spec fxp_res_spec_mem[] = { @@ -2212,18 +2216,15 @@ fxp_stop(struct fxp_softc *sc) * Release any xmit buffers. */ txp = sc->fxp_desc.tx_list; - if (txp != NULL) { - for (i = 0; i < FXP_NTXCB; i++) { - if (txp[i].tx_mbuf != NULL) { - bus_dmamap_sync(sc->fxp_txmtag, txp[i].tx_map, - BUS_DMASYNC_POSTWRITE); - bus_dmamap_unload(sc->fxp_txmtag, - txp[i].tx_map); - m_freem(txp[i].tx_mbuf); - txp[i].tx_mbuf = NULL; - /* clear this to reset csum offload bits */ - txp[i].tx_cb->tbd[0].tb_addr = 0; - } + for (i = 0; i < FXP_NTXCB; i++) { + if (txp[i].tx_mbuf != NULL) { + bus_dmamap_sync(sc->fxp_txmtag, txp[i].tx_map, + BUS_DMASYNC_POSTWRITE); + bus_dmamap_unload(sc->fxp_txmtag, txp[i].tx_map); + m_freem(txp[i].tx_mbuf); + txp[i].tx_mbuf = NULL; + /* clear this to reset csum offload bits */ + txp[i].tx_cb->tbd[0].tb_addr = 0; } } bus_dmamap_sync(sc->cbl_tag, sc->cbl_map, diff --git a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/if_fxpreg.h b/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/if_fxpreg.h index 7ee8588400..283a091ff7 100644 --- a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/if_fxpreg.h +++ b/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/if_fxpreg.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * * Copyright (c) 1995, David Greenman * Copyright (c) 2001 Jonathan Lemon * All rights reserved. @@ -25,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: releng/12.0/sys/dev/fxp/if_fxpreg.h 326255 2017-11-27 14:52:40Z pfg $ */ #define FXP_PCI_MMBA 0x10 diff --git a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/if_fxpvar.h b/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/if_fxpvar.h index 78200ce3b3..ea6a5e45b4 100644 --- a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/if_fxpvar.h +++ b/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/if_fxpvar.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 1995, David Greenman * 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/fxp/if_fxpvar.h 326255 2017-11-27 14:52:40Z pfg $ */ /* diff --git a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/inphy.c b/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/inphy.c index 8a9a60c680..1ff77a7f15 100644 --- a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/inphy.c +++ b/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/inphy.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 2001 Jonathan Lemon * All rights reserved. * @@ -29,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/fxp/inphy.c 326022 2017-11-20 19:36:21Z pfg $"); /* * driver for Intel 82553 and 82555 PHYs diff --git a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/inphyreg.h b/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/inphyreg.h index 42c683dbf1..1b309601fe 100644 --- a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/inphyreg.h +++ b/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/inphyreg.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 2001 Jonathan Lemon * All rights reserved. * @@ -26,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: releng/12.0/sys/dev/fxp/inphyreg.h 326022 2017-11-20 19:36:21Z pfg $ */ #ifndef _INPHYREG_H diff --git a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/rcvbundl.h b/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/rcvbundl.h index dac793df56..d65af22608 100644 --- a/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/rcvbundl.h +++ b/src/add-ons/kernel/drivers/network/ipro100/dev/fxp/rcvbundl.h @@ -1,4 +1,6 @@ /*- +SPDX-License-Identifier: BSD-3-Clause + Copyright (c) 1999-2001, Intel Corporation All rights reserved. @@ -29,7 +31,7 @@ NEGLIGENCE OR OTHERWISE) 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/fxp/rcvbundl.h 326022 2017-11-20 19:36:21Z pfg $ */ /* rcvbundl.h