Author: avos
Date: Sat Mar 10 23:16:24 2018
New Revision: 330749
URL: https://svnweb.freebsd.org/changeset/base/330749
Log:
usb/wlan/*: properly include "opt_wlan.h" into all drivers
Without it driver cannot be loaded when wlan(4) module is built with
'options IEEE80211_DEBUG_REFCNT'.
Modified:
head/sys/dev/usb/wlan/if_rum.c
head/sys/dev/usb/wlan/if_run.c
head/sys/dev/usb/wlan/if_uath.c
head/sys/dev/usb/wlan/if_upgt.c
head/sys/dev/usb/wlan/if_ural.c
head/sys/dev/usb/wlan/if_urtw.c
head/sys/dev/usb/wlan/if_zyd.c
head/sys/modules/usb/rum/Makefile
head/sys/modules/usb/run/Makefile
head/sys/modules/usb/uath/Makefile
head/sys/modules/usb/upgt/Makefile
head/sys/modules/usb/ural/Makefile
head/sys/modules/usb/urtw/Makefile
head/sys/modules/usb/zyd/Makefile
Modified: head/sys/dev/usb/wlan/if_rum.c
==============================================================================
--- head/sys/dev/usb/wlan/if_rum.c Sat Mar 10 23:04:03 2018
(r330748)
+++ head/sys/dev/usb/wlan/if_rum.c Sat Mar 10 23:16:24 2018
(r330749)
@@ -27,6 +27,8 @@ __FBSDID("$FreeBSD$");
* http://www.ralinktech.com.tw/
*/
+#include "opt_wlan.h"
+
#include <sys/param.h>
#include <sys/sockio.h>
#include <sys/sysctl.h>
Modified: head/sys/dev/usb/wlan/if_run.c
==============================================================================
--- head/sys/dev/usb/wlan/if_run.c Sat Mar 10 23:04:03 2018
(r330748)
+++ head/sys/dev/usb/wlan/if_run.c Sat Mar 10 23:16:24 2018
(r330749)
@@ -25,6 +25,8 @@ __FBSDID("$FreeBSD$");
* http://www.ralinktech.com/
*/
+#include "opt_wlan.h"
+
#include <sys/param.h>
#include <sys/sockio.h>
#include <sys/sysctl.h>
Modified: head/sys/dev/usb/wlan/if_uath.c
==============================================================================
--- head/sys/dev/usb/wlan/if_uath.c Sat Mar 10 23:04:03 2018
(r330748)
+++ head/sys/dev/usb/wlan/if_uath.c Sat Mar 10 23:16:24 2018
(r330749)
@@ -67,6 +67,9 @@ __FBSDID("$FreeBSD$");
* for these devices does not work in this way and so does not work
* with this driver.
*/
+
+#include "opt_wlan.h"
+
#include <sys/param.h>
#include <sys/sockio.h>
#include <sys/sysctl.h>
Modified: head/sys/dev/usb/wlan/if_upgt.c
==============================================================================
--- head/sys/dev/usb/wlan/if_upgt.c Sat Mar 10 23:04:03 2018
(r330748)
+++ head/sys/dev/usb/wlan/if_upgt.c Sat Mar 10 23:16:24 2018
(r330749)
@@ -17,6 +17,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include "opt_wlan.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
Modified: head/sys/dev/usb/wlan/if_ural.c
==============================================================================
--- head/sys/dev/usb/wlan/if_ural.c Sat Mar 10 23:04:03 2018
(r330748)
+++ head/sys/dev/usb/wlan/if_ural.c Sat Mar 10 23:16:24 2018
(r330749)
@@ -28,6 +28,8 @@ __FBSDID("$FreeBSD$");
* http://www.ralinktech.com/
*/
+#include "opt_wlan.h"
+
#include <sys/param.h>
#include <sys/sockio.h>
#include <sys/sysctl.h>
Modified: head/sys/dev/usb/wlan/if_urtw.c
==============================================================================
--- head/sys/dev/usb/wlan/if_urtw.c Sat Mar 10 23:04:03 2018
(r330748)
+++ head/sys/dev/usb/wlan/if_urtw.c Sat Mar 10 23:16:24 2018
(r330749)
@@ -16,6 +16,9 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+
+#include "opt_wlan.h"
+
#include <sys/param.h>
#include <sys/sockio.h>
#include <sys/sysctl.h>
Modified: head/sys/dev/usb/wlan/if_zyd.c
==============================================================================
--- head/sys/dev/usb/wlan/if_zyd.c Sat Mar 10 23:04:03 2018
(r330748)
+++ head/sys/dev/usb/wlan/if_zyd.c Sat Mar 10 23:16:24 2018
(r330749)
@@ -26,6 +26,8 @@ __FBSDID("$FreeBSD$");
* ZyDAS ZD1211/ZD1211B USB WLAN driver.
*/
+#include "opt_wlan.h"
+
#include <sys/param.h>
#include <sys/sockio.h>
#include <sys/sysctl.h>
Modified: head/sys/modules/usb/rum/Makefile
==============================================================================
--- head/sys/modules/usb/rum/Makefile Sat Mar 10 23:04:03 2018
(r330748)
+++ head/sys/modules/usb/rum/Makefile Sat Mar 10 23:16:24 2018
(r330749)
@@ -30,7 +30,7 @@ S= ${SRCTOP}/sys
.PATH: $S/dev/usb/wlan
KMOD= if_rum
-SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \
- if_rum.c
+SRCS= opt_bus.h opt_usb.h opt_wlan.h device_if.h bus_if.h usb_if.h \
+ usbdevs.h if_rum.c
.include <bsd.kmod.mk>
Modified: head/sys/modules/usb/run/Makefile
==============================================================================
--- head/sys/modules/usb/run/Makefile Sat Mar 10 23:04:03 2018
(r330748)
+++ head/sys/modules/usb/run/Makefile Sat Mar 10 23:16:24 2018
(r330749)
@@ -30,7 +30,7 @@ S= ${SRCTOP}/sys
.PATH: $S/dev/usb/wlan
KMOD= if_run
-SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \
- if_run.c
+SRCS= opt_bus.h opt_usb.h opt_wlan.h device_if.h bus_if.h usb_if.h \
+ usbdevs.h if_run.c
.include <bsd.kmod.mk>
Modified: head/sys/modules/usb/uath/Makefile
==============================================================================
--- head/sys/modules/usb/uath/Makefile Sat Mar 10 23:04:03 2018
(r330748)
+++ head/sys/modules/usb/uath/Makefile Sat Mar 10 23:16:24 2018
(r330749)
@@ -5,6 +5,6 @@
KMOD = if_uath
SRCS = if_uath.c if_uathvar.h if_uathreg.h \
bus_if.h device_if.h \
- opt_bus.h opt_usb.h usb_if.h usbdevs.h
+ opt_bus.h opt_usb.h opt_wlan.h usb_if.h usbdevs.h
.include <bsd.kmod.mk>
Modified: head/sys/modules/usb/upgt/Makefile
==============================================================================
--- head/sys/modules/usb/upgt/Makefile Sat Mar 10 23:04:03 2018
(r330748)
+++ head/sys/modules/usb/upgt/Makefile Sat Mar 10 23:16:24 2018
(r330749)
@@ -5,6 +5,6 @@
KMOD = if_upgt
SRCS = if_upgt.c if_upgtvar.h \
bus_if.h device_if.h \
- opt_bus.h opt_usb.h usb_if.h usbdevs.h
+ opt_bus.h opt_usb.h opt_wlan.h usb_if.h usbdevs.h
.include <bsd.kmod.mk>
Modified: head/sys/modules/usb/ural/Makefile
==============================================================================
--- head/sys/modules/usb/ural/Makefile Sat Mar 10 23:04:03 2018
(r330748)
+++ head/sys/modules/usb/ural/Makefile Sat Mar 10 23:16:24 2018
(r330749)
@@ -30,7 +30,7 @@ S= ${SRCTOP}/sys
.PATH: $S/dev/usb/wlan
KMOD= if_ural
-SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \
- if_ural.c
+SRCS= opt_bus.h opt_usb.h opt_wlan.h device_if.h bus_if.h usb_if.h \
+ usbdevs.h if_ural.c
.include <bsd.kmod.mk>
Modified: head/sys/modules/usb/urtw/Makefile
==============================================================================
--- head/sys/modules/usb/urtw/Makefile Sat Mar 10 23:04:03 2018
(r330748)
+++ head/sys/modules/usb/urtw/Makefile Sat Mar 10 23:16:24 2018
(r330749)
@@ -5,6 +5,6 @@
KMOD = if_urtw
SRCS = if_urtw.c if_urtwreg.h if_urtwvar.h \
bus_if.h device_if.h \
- opt_bus.h opt_usb.h usb_if.h usbdevs.h
+ opt_bus.h opt_usb.h opt_wlan.h usb_if.h usbdevs.h
.include <bsd.kmod.mk>
Modified: head/sys/modules/usb/zyd/Makefile
==============================================================================
--- head/sys/modules/usb/zyd/Makefile Sat Mar 10 23:04:03 2018
(r330748)
+++ head/sys/modules/usb/zyd/Makefile Sat Mar 10 23:16:24 2018
(r330749)
@@ -30,7 +30,7 @@ S= ${SRCTOP}/sys
.PATH: $S/dev/usb/wlan
KMOD= if_zyd
-SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \
- if_zyd.c if_zydreg.h if_zydfw.h
+SRCS= opt_bus.h opt_usb.h opt_wlan.h device_if.h bus_if.h usb_if.h \
+ usbdevs.h if_zyd.c if_zydreg.h if_zydfw.h
.include <bsd.kmod.mk>
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
