wavelanwifi: Upgrade to FreeBSD 12.

This commit is contained in:
Augustin Cavalier
2019-01-10 20:10:37 -05:00
parent db7b74600c
commit baf68028bf
7 changed files with 25 additions and 13 deletions
@@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
* Bill Paul <[email protected]>. All rights reserved. * Bill Paul <[email protected]>. All rights reserved.
* *
@@ -29,7 +31,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE. * THE POSSIBILITY OF SUCH DAMAGE.
* *
* $FreeBSD: releng/11.1/sys/dev/wi/if_wavelan_ieee.h 298955 2016-05-03 03:41:25Z pfg $ * $FreeBSD: releng/12.0/sys/dev/wi/if_wavelan_ieee.h 325966 2017-11-18 14:26:50Z pfg $
*/ */
#ifndef _IF_WAVELAN_IEEE_H #ifndef _IF_WAVELAN_IEEE_H
@@ -60,7 +60,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD: releng/11.1/sys/dev/wi/if_wi.c 300292 2016-05-20 08:58:06Z avos $"); __FBSDID("$FreeBSD: releng/12.0/sys/dev/wi/if_wi.c 333813 2018-05-18 20:13:34Z mmacy $");
#define WI_HERMES_STATS_WAR /* Work around stats counter bug. */ #define WI_HERMES_STATS_WAR /* Work around stats counter bug. */
@@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 2013 Justin Hibbits * Copyright (c) 2013 Justin Hibbits
* All rights reserved. * All rights reserved.
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
@@ -42,7 +44,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD: releng/11.1/sys/dev/wi/if_wi_macio.c 287197 2015-08-27 08:56:39Z glebius $"); __FBSDID("$FreeBSD: releng/12.0/sys/dev/wi/if_wi_macio.c 325966 2017-11-18 14:26:50Z pfg $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/kernel.h> #include <sys/kernel.h>
@@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
* Bill Paul <[email protected]>. All rights reserved. * Bill Paul <[email protected]>. All rights reserved.
* *
@@ -39,7 +41,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD: releng/11.1/sys/dev/wi/if_wi_pccard.c 292079 2015-12-11 05:27:56Z imp $"); __FBSDID("$FreeBSD: releng/12.0/sys/dev/wi/if_wi_pccard.c 325966 2017-11-18 14:26:50Z pfg $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/kernel.h> #include <sys/kernel.h>
@@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
* Bill Paul <[email protected]>. All rights reserved. * Bill Paul <[email protected]>. All rights reserved.
* *
@@ -29,7 +31,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE. * THE POSSIBILITY OF SUCH DAMAGE.
* *
* $FreeBSD: releng/11.1/sys/dev/wi/if_wi_pci.c 315483 2017-03-18 13:58:25Z kevlo $ * $FreeBSD: releng/12.0/sys/dev/wi/if_wi_pci.c 325966 2017-11-18 14:26:50Z pfg $
*/ */
/* /*
@@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
* Bill Paul <[email protected]>. All rights reserved. * Bill Paul <[email protected]>. All rights reserved.
* *
@@ -29,7 +31,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE. * THE POSSIBILITY OF SUCH DAMAGE.
* *
* $FreeBSD: releng/11.1/sys/dev/wi/if_wireg.h 298955 2016-05-03 03:41:25Z pfg $ * $FreeBSD: releng/12.0/sys/dev/wi/if_wireg.h 325966 2017-11-18 14:26:50Z pfg $
*/ */
#define WI_DELAY 5 #define WI_DELAY 5
@@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 2002 * Copyright (c) 2002
* M Warner Losh <[email protected]>. All rights reserved. * M Warner Losh <[email protected]>. All rights reserved.
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
@@ -31,7 +33,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE. * THE POSSIBILITY OF SUCH DAMAGE.
* *
* $FreeBSD: releng/11.1/sys/dev/wi/if_wivar.h 300238 2016-05-19 22:14:35Z avos $ * $FreeBSD: releng/12.0/sys/dev/wi/if_wivar.h 325966 2017-11-18 14:26:50Z pfg $
*/ */
/* /*