From a2045452ffa5d0efd0f1a2cef595a71e74d32d20 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 10 Jan 2019 17:28:29 -0500 Subject: [PATCH] iprowifi2100: Upgrade to FreeBSD 12. --- .../drivers/network/wlan/iprowifi2100/dev/ipw/if_ipw.c | 6 +++++- .../drivers/network/wlan/iprowifi2100/dev/ipw/if_ipwreg.h | 4 +++- .../drivers/network/wlan/iprowifi2100/dev/ipw/if_ipwvar.h | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/dev/ipw/if_ipw.c b/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/dev/ipw/if_ipw.c index 0957efcf37..17f398ab66 100644 --- a/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/dev/ipw/if_ipw.c +++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/dev/ipw/if_ipw.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2004-2006 * Damien Bergamini . All rights reserved. * Copyright (c) 2006 Sam Leffler, Errno Consulting @@ -28,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: releng/11.1/sys/dev/ipw/if_ipw.c 300239 2016-05-19 22:19:35Z avos $"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/ipw/if_ipw.c 339975 2018-10-31 23:02:59Z glebius $"); /*- * Intel(R) PRO/Wireless 2100 MiniPCI driver @@ -200,6 +202,8 @@ static driver_t ipw_driver = { static devclass_t ipw_devclass; DRIVER_MODULE(ipw, pci, ipw_driver, ipw_devclass, NULL, NULL); +MODULE_PNP_INFO("U16:vendor;U16:device;D:#", pci, ipw, ipw_ident_table, + nitems(ipw_ident_table) - 1); MODULE_VERSION(ipw, 1); diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/dev/ipw/if_ipwreg.h b/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/dev/ipw/if_ipwreg.h index bb95c06816..1ae7cf330d 100644 --- a/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/dev/ipw/if_ipwreg.h +++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/dev/ipw/if_ipwreg.h @@ -1,6 +1,8 @@ -/* $FreeBSD: releng/11.1/sys/dev/ipw/if_ipwreg.h 172567 2007-10-12 05:23:00Z thompsa $ */ +/* $FreeBSD: releng/12.0/sys/dev/ipw/if_ipwreg.h 326255 2017-11-27 14:52:40Z pfg $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2004-2006 * Damien Bergamini . All rights reserved. * diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/dev/ipw/if_ipwvar.h b/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/dev/ipw/if_ipwvar.h index 518b0db889..7ac58151c7 100644 --- a/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/dev/ipw/if_ipwvar.h +++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/dev/ipw/if_ipwvar.h @@ -1,6 +1,8 @@ -/* $FreeBSD: releng/11.1/sys/dev/ipw/if_ipwvar.h 300239 2016-05-19 22:19:35Z avos $ */ +/* $FreeBSD: releng/12.0/sys/dev/ipw/if_ipwvar.h 326255 2017-11-27 14:52:40Z pfg $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2004-2006 * Damien Bergamini . All rights reserved. *