[Midnightbsd-cvs] src [12296] trunk/sys/dev/usb/wlan: update includes

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Feb 2 16:19:41 EST 2020 

Revision: 12296
          http://svnweb.midnightbsd.org/src/?rev=12296
Author:   laffer1
Date:     2020-02-02 16:19:40 -0500 (Sun, 02 Feb 2020)
Log Message:
-----------
update includes

Modified Paths:
--------------
    trunk/sys/dev/usb/wlan/if_rsu.c
    trunk/sys/dev/usb/wlan/if_rum.c
    trunk/sys/dev/usb/wlan/if_run.c
    trunk/sys/dev/usb/wlan/if_uath.c
    trunk/sys/dev/usb/wlan/if_upgt.c
    trunk/sys/dev/usb/wlan/if_ural.c

Modified: trunk/sys/dev/usb/wlan/if_rsu.c
===================================================================
--- trunk/sys/dev/usb/wlan/if_rsu.c	2020-01-28 20:47:09 UTC (rev 12295)
+++ trunk/sys/dev/usb/wlan/if_rsu.c	2020-02-02 21:19:40 UTC (rev 12296)
@@ -17,7 +17,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: stable/10/sys/dev/usb/wlan/if_rsu.c 321981 2017-08-03 07:56:39Z hselasky $");
+__FBSDID("$FreeBSD: stable/10/sys/dev/usb/wlan/if_rsu.c 343760 2019-02-05 03:01:10Z avos $");
 
 /*
  * Driver for Realtek RTL8188SU/RTL8191SU/RTL8192SU.
@@ -36,13 +36,9 @@
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/bus.h>
-#include <sys/rman.h>
 #include <sys/firmware.h>
 #include <sys/module.h>
 
-#include <machine/bus.h>
-#include <machine/resource.h>
-
 #include <net/bpf.h>
 #include <net/if.h>
 #include <net/if_arp.h>

Modified: trunk/sys/dev/usb/wlan/if_rum.c
===================================================================
--- trunk/sys/dev/usb/wlan/if_rum.c	2020-01-28 20:47:09 UTC (rev 12295)
+++ trunk/sys/dev/usb/wlan/if_rum.c	2020-02-02 21:19:40 UTC (rev 12296)
@@ -1,5 +1,5 @@
 /* $MidnightBSD$ */
-/*	$FreeBSD: stable/10/sys/dev/usb/wlan/if_rum.c 269266 2014-07-29 21:59:24Z hselasky $	*/
+/*	$FreeBSD: stable/10/sys/dev/usb/wlan/if_rum.c 343760 2019-02-05 03:01:10Z avos $	*/
 
 /*-
  * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini at free.fr>
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: stable/10/sys/dev/usb/wlan/if_rum.c 269266 2014-07-29 21:59:24Z hselasky $");
+__FBSDID("$FreeBSD: stable/10/sys/dev/usb/wlan/if_rum.c 343760 2019-02-05 03:01:10Z avos $");
 
 /*-
  * Ralink Technology RT2501USB/RT2601USB chipset driver
@@ -42,10 +42,6 @@
 #include <sys/endian.h>
 #include <sys/kdb.h>
 
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/rman.h>
-
 #include <net/bpf.h>
 #include <net/if.h>
 #include <net/if_arp.h>

Modified: trunk/sys/dev/usb/wlan/if_run.c
===================================================================
--- trunk/sys/dev/usb/wlan/if_run.c	2020-01-28 20:47:09 UTC (rev 12295)
+++ trunk/sys/dev/usb/wlan/if_run.c	2020-02-02 21:19:40 UTC (rev 12296)
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: stable/10/sys/dev/usb/wlan/if_run.c 292183 2015-12-14 09:24:40Z hselasky $");
+__FBSDID("$FreeBSD: stable/10/sys/dev/usb/wlan/if_run.c 343821 2019-02-06 02:18:11Z avos $");
 
 /*-
  * Ralink Technology RT2700U/RT2800U/RT3000U/RT3900E chipset driver.
@@ -43,10 +43,6 @@
 #include <sys/firmware.h>
 #include <sys/kdb.h>
 
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/rman.h>
-
 #include <net/bpf.h>
 #include <net/if.h>
 #include <net/if_arp.h>
@@ -1992,7 +1988,8 @@
 static struct ieee80211_node *
 run_node_alloc(struct ieee80211vap *vap, const uint8_t mac[IEEE80211_ADDR_LEN])
 {
-	return malloc(sizeof (struct run_node), M_DEVBUF, M_NOWAIT | M_ZERO);
+	return malloc(sizeof (struct run_node), M_80211_NODE,
+	    M_NOWAIT | M_ZERO);
 }
 
 static int

Modified: trunk/sys/dev/usb/wlan/if_uath.c
===================================================================
--- trunk/sys/dev/usb/wlan/if_uath.c	2020-01-28 20:47:09 UTC (rev 12295)
+++ trunk/sys/dev/usb/wlan/if_uath.c	2020-02-02 21:19:40 UTC (rev 12296)
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: stable/10/sys/dev/usb/wlan/if_uath.c 262007 2014-02-17 01:36:53Z kevlo $");
+__FBSDID("$FreeBSD: stable/10/sys/dev/usb/wlan/if_uath.c 343760 2019-02-05 03:01:10Z avos $");
 
 /*-
  * Driver for Atheros AR5523 USB parts.
@@ -81,10 +81,6 @@
 #include <sys/endian.h>
 #include <sys/kdb.h>
 
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/rman.h>
-
 #include <net/bpf.h>
 #include <net/if.h>
 #include <net/if_arp.h>

Modified: trunk/sys/dev/usb/wlan/if_upgt.c
===================================================================
--- trunk/sys/dev/usb/wlan/if_upgt.c	2020-01-28 20:47:09 UTC (rev 12295)
+++ trunk/sys/dev/usb/wlan/if_upgt.c	2020-02-02 21:19:40 UTC (rev 12296)
@@ -1,6 +1,6 @@
 /* $MidnightBSD$ */
 /*	$OpenBSD: if_upgt.c,v 1.35 2008/04/16 18:32:15 damien Exp $ */
-/*	$FreeBSD: stable/10/sys/dev/usb/wlan/if_upgt.c 292183 2015-12-14 09:24:40Z hselasky $ */
+/*	$FreeBSD: stable/10/sys/dev/usb/wlan/if_upgt.c 343816 2019-02-06 01:42:26Z avos $ */
 
 /*
  * Copyright (c) 2007 Marcus Glocker <mglocker at openbsd.org>
@@ -39,7 +39,6 @@
 #include <net/if_types.h>
 
 #include <sys/bus.h>
-#include <machine/bus.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_phy.h>
@@ -1702,7 +1701,7 @@
 		data_cmd->buflen = bsize;
 		upgt_bulk_tx(sc, data_cmd);
 
-		DPRINTF(sc, UPGT_DEBUG_FW, "FW offset=%d, read=%d, sent=%d\n",
+		DPRINTF(sc, UPGT_DEBUG_FW, "FW offset=%zu, read=%d, sent=%d\n",
 		    offset, n, bsize);
 		bsize = n;
 	}
@@ -1859,7 +1858,7 @@
 	}
 
 	DPRINTF(sc, UPGT_DEBUG_FW,
-	    "firmware Boot Record Area found at offset %d\n", offset);
+	    "firmware Boot Record Area found at offset %zu\n", offset);
 
 	/*
 	 * Parse Boot Record Area (BRA) options.

Modified: trunk/sys/dev/usb/wlan/if_ural.c
===================================================================
--- trunk/sys/dev/usb/wlan/if_ural.c	2020-01-28 20:47:09 UTC (rev 12295)
+++ trunk/sys/dev/usb/wlan/if_ural.c	2020-02-02 21:19:40 UTC (rev 12296)
@@ -1,5 +1,5 @@
 /* $MidnightBSD$ */
-/*	$FreeBSD: stable/10/sys/dev/usb/wlan/if_ural.c 269266 2014-07-29 21:59:24Z hselasky $	*/
+/*	$FreeBSD: stable/10/sys/dev/usb/wlan/if_ural.c 343760 2019-02-05 03:01:10Z avos $	*/
 
 /*-
  * Copyright (c) 2005, 2006
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: stable/10/sys/dev/usb/wlan/if_ural.c 269266 2014-07-29 21:59:24Z hselasky $");
+__FBSDID("$FreeBSD: stable/10/sys/dev/usb/wlan/if_ural.c 343760 2019-02-05 03:01:10Z avos $");
 
 /*-
  * Ralink Technology RT2500USB chipset driver
@@ -44,10 +44,6 @@
 #include <sys/endian.h>
 #include <sys/kdb.h>
 
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/rman.h>
-
 #include <net/bpf.h>
 #include <net/if.h>
 #include <net/if_arp.h>

More information about the Midnightbsd-cvs mailing list