From owner-svn-src-all@freebsd.org Sat Mar 10 23:16:26 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 37E6EF3E8A2; Sat, 10 Mar 2018 23:16:26 +0000 (UTC) (envelope-from avos@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D8A7D6AD1E; Sat, 10 Mar 2018 23:16:25 +0000 (UTC) (envelope-from avos@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D39AA14616; Sat, 10 Mar 2018 23:16:25 +0000 (UTC) (envelope-from avos@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2ANGPoU033336; Sat, 10 Mar 2018 23:16:25 GMT (envelope-from avos@FreeBSD.org) Received: (from avos@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2ANGOLV033320; Sat, 10 Mar 2018 23:16:24 GMT (envelope-from avos@FreeBSD.org) Message-Id: <201803102316.w2ANGOLV033320@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avos set sender to avos@FreeBSD.org using -f From: Andriy Voskoboinyk Date: Sat, 10 Mar 2018 23:16:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r330749 - in head/sys: dev/usb/wlan modules/usb/rum modules/usb/run modules/usb/uath modules/usb/upgt modules/usb/ural modules/usb/urtw modules/usb/zyd X-SVN-Group: head X-SVN-Commit-Author: avos X-SVN-Commit-Paths: in head/sys: dev/usb/wlan modules/usb/rum modules/usb/run modules/usb/uath modules/usb/upgt modules/usb/ural modules/usb/urtw modules/usb/zyd X-SVN-Commit-Revision: 330749 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Mar 2018 23:16:26 -0000 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 #include #include 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 #include #include 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 #include #include 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 #include #include 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 #include #include 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 __FBSDID("$FreeBSD$"); + +#include "opt_wlan.h" + #include #include #include 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 #include #include 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 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 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 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 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 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 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