From 63a55eab9bc96cf6a8d8334fc2a4a4c8992cce2a Mon Sep 17 00:00:00 2001 From: Andriy Voskoboinyk Date: Sat, 10 Mar 2018 23:16:24 +0000 Subject: [PATCH] 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'. --- sys/dev/usb/wlan/if_rum.c | 2 ++ sys/dev/usb/wlan/if_run.c | 2 ++ sys/dev/usb/wlan/if_uath.c | 3 +++ sys/dev/usb/wlan/if_upgt.c | 2 ++ sys/dev/usb/wlan/if_ural.c | 2 ++ sys/dev/usb/wlan/if_urtw.c | 3 +++ sys/dev/usb/wlan/if_zyd.c | 2 ++ sys/modules/usb/rum/Makefile | 4 ++-- sys/modules/usb/run/Makefile | 4 ++-- sys/modules/usb/uath/Makefile | 2 +- sys/modules/usb/upgt/Makefile | 2 +- sys/modules/usb/ural/Makefile | 4 ++-- sys/modules/usb/urtw/Makefile | 2 +- sys/modules/usb/zyd/Makefile | 4 ++-- 14 files changed, 27 insertions(+), 11 deletions(-) diff --git a/sys/dev/usb/wlan/if_rum.c b/sys/dev/usb/wlan/if_rum.c index 572e88579b8..40be784d723 100644 --- a/sys/dev/usb/wlan/if_rum.c +++ b/sys/dev/usb/wlan/if_rum.c @@ -27,6 +27,8 @@ __FBSDID("$FreeBSD$"); * http://www.ralinktech.com.tw/ */ +#include "opt_wlan.h" + #include #include #include diff --git a/sys/dev/usb/wlan/if_run.c b/sys/dev/usb/wlan/if_run.c index 1980011636c..97f8ce3b078 100644 --- a/sys/dev/usb/wlan/if_run.c +++ b/sys/dev/usb/wlan/if_run.c @@ -25,6 +25,8 @@ __FBSDID("$FreeBSD$"); * http://www.ralinktech.com/ */ +#include "opt_wlan.h" + #include #include #include diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c index 07bac12415f..7ae52bdb390 100644 --- a/sys/dev/usb/wlan/if_uath.c +++ b/sys/dev/usb/wlan/if_uath.c @@ -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 #include #include diff --git a/sys/dev/usb/wlan/if_upgt.c b/sys/dev/usb/wlan/if_upgt.c index 11eec385449..4da80fa6896 100644 --- a/sys/dev/usb/wlan/if_upgt.c +++ b/sys/dev/usb/wlan/if_upgt.c @@ -17,6 +17,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "opt_wlan.h" + #include #include #include diff --git a/sys/dev/usb/wlan/if_ural.c b/sys/dev/usb/wlan/if_ural.c index e163c51e170..f48cd5d1aca 100644 --- a/sys/dev/usb/wlan/if_ural.c +++ b/sys/dev/usb/wlan/if_ural.c @@ -28,6 +28,8 @@ __FBSDID("$FreeBSD$"); * http://www.ralinktech.com/ */ +#include "opt_wlan.h" + #include #include #include diff --git a/sys/dev/usb/wlan/if_urtw.c b/sys/dev/usb/wlan/if_urtw.c index 0beff5d2139..f12297167ac 100644 --- a/sys/dev/usb/wlan/if_urtw.c +++ b/sys/dev/usb/wlan/if_urtw.c @@ -16,6 +16,9 @@ #include __FBSDID("$FreeBSD$"); + +#include "opt_wlan.h" + #include #include #include diff --git a/sys/dev/usb/wlan/if_zyd.c b/sys/dev/usb/wlan/if_zyd.c index 5d9f7b10d6f..6d0f467d841 100644 --- a/sys/dev/usb/wlan/if_zyd.c +++ b/sys/dev/usb/wlan/if_zyd.c @@ -26,6 +26,8 @@ __FBSDID("$FreeBSD$"); * ZyDAS ZD1211/ZD1211B USB WLAN driver. */ +#include "opt_wlan.h" + #include #include #include diff --git a/sys/modules/usb/rum/Makefile b/sys/modules/usb/rum/Makefile index 31c097bc072..e468ff81ed5 100644 --- a/sys/modules/usb/rum/Makefile +++ b/sys/modules/usb/rum/Makefile @@ -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 diff --git a/sys/modules/usb/run/Makefile b/sys/modules/usb/run/Makefile index 05769bc6e9f..980d061cc40 100644 --- a/sys/modules/usb/run/Makefile +++ b/sys/modules/usb/run/Makefile @@ -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 diff --git a/sys/modules/usb/uath/Makefile b/sys/modules/usb/uath/Makefile index 48ef747852c..b6f3308f1a0 100644 --- a/sys/modules/usb/uath/Makefile +++ b/sys/modules/usb/uath/Makefile @@ -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 diff --git a/sys/modules/usb/upgt/Makefile b/sys/modules/usb/upgt/Makefile index d8d97f3ca8e..7da5dd2fde0 100644 --- a/sys/modules/usb/upgt/Makefile +++ b/sys/modules/usb/upgt/Makefile @@ -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 diff --git a/sys/modules/usb/ural/Makefile b/sys/modules/usb/ural/Makefile index afd56be8214..01ab503dc74 100644 --- a/sys/modules/usb/ural/Makefile +++ b/sys/modules/usb/ural/Makefile @@ -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 diff --git a/sys/modules/usb/urtw/Makefile b/sys/modules/usb/urtw/Makefile index 2d282a282a5..25cbb40b02d 100644 --- a/sys/modules/usb/urtw/Makefile +++ b/sys/modules/usb/urtw/Makefile @@ -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 diff --git a/sys/modules/usb/zyd/Makefile b/sys/modules/usb/zyd/Makefile index 9852e5cc4fc..40909459034 100644 --- a/sys/modules/usb/zyd/Makefile +++ b/sys/modules/usb/zyd/Makefile @@ -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