From a9943f3dca66d49f9a19c61ffe126d56d4964cb5 Mon Sep 17 00:00:00 2001
From: adrian <adrian@FreeBSD.org>
Date: Mon, 16 May 2016 22:56:45 +0000
Subject: [PATCH] [bwn] add opt_wlan.h and opt_bwn.h so we can enable bwn
 debugging as appropriate.

Tested:

* BCM4322, STA mode (11a)

Sponsored by:	Palm Springs
---
 sys/dev/bwn/bwn_mac.c           | 3 +++
 sys/dev/bwn/if_bwn_debug.h      | 2 --
 sys/dev/bwn/if_bwn_pci.c        | 3 +++
 sys/dev/bwn/if_bwn_phy_common.c | 3 +++
 sys/dev/bwn/if_bwn_phy_g.c      | 3 +++
 sys/dev/bwn/if_bwn_phy_lp.c     | 3 +++
 sys/dev/bwn/if_bwn_util.c       | 3 +++
 7 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/sys/dev/bwn/bwn_mac.c b/sys/dev/bwn/bwn_mac.c
index 8b2e962935ed..cba49ba6fb48 100644
--- a/sys/dev/bwn/bwn_mac.c
+++ b/sys/dev/bwn/bwn_mac.c
@@ -30,6 +30,9 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_bwn.h"
+#include "opt_wlan.h"
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
diff --git a/sys/dev/bwn/if_bwn_debug.h b/sys/dev/bwn/if_bwn_debug.h
index 70f554137f03..d7a636d21e59 100644
--- a/sys/dev/bwn/if_bwn_debug.h
+++ b/sys/dev/bwn/if_bwn_debug.h
@@ -32,8 +32,6 @@
 #ifndef	__IF_BWN_DEBUG_H__
 #define	__IF_BWN_DEBUG_H__
 
-#define	BWN_DEBUG
-
 enum {
 	BWN_DEBUG_XMIT		= 0x00000001,	/* basic xmit operation */
 	BWN_DEBUG_RECV		= 0x00000002,	/* basic recv operation */
diff --git a/sys/dev/bwn/if_bwn_pci.c b/sys/dev/bwn/if_bwn_pci.c
index 7e145c5ce4dd..7a794b8ca257 100644
--- a/sys/dev/bwn/if_bwn_pci.c
+++ b/sys/dev/bwn/if_bwn_pci.c
@@ -30,6 +30,9 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_bwn.h"
+#include "opt_wlan.h"
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
diff --git a/sys/dev/bwn/if_bwn_phy_common.c b/sys/dev/bwn/if_bwn_phy_common.c
index 04fb283e0428..2acb3746f9d7 100644
--- a/sys/dev/bwn/if_bwn_phy_common.c
+++ b/sys/dev/bwn/if_bwn_phy_common.c
@@ -31,6 +31,9 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_bwn.h"
+#include "opt_wlan.h"
+
 /*
  * The Broadcom Wireless LAN controller driver.
  */
diff --git a/sys/dev/bwn/if_bwn_phy_g.c b/sys/dev/bwn/if_bwn_phy_g.c
index 1a21dac6facb..5cc4cb908be0 100644
--- a/sys/dev/bwn/if_bwn_phy_g.c
+++ b/sys/dev/bwn/if_bwn_phy_g.c
@@ -30,6 +30,9 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_bwn.h"
+#include "opt_wlan.h"
+
 /*
  * The Broadcom Wireless LAN controller driver.
  */
diff --git a/sys/dev/bwn/if_bwn_phy_lp.c b/sys/dev/bwn/if_bwn_phy_lp.c
index 79a986f6ae57..0ca1b6a88ad5 100644
--- a/sys/dev/bwn/if_bwn_phy_lp.c
+++ b/sys/dev/bwn/if_bwn_phy_lp.c
@@ -30,6 +30,9 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_bwn.h"
+#include "opt_wlan.h"
+
 /*
  * The Broadcom Wireless LAN controller driver.
  */
diff --git a/sys/dev/bwn/if_bwn_util.c b/sys/dev/bwn/if_bwn_util.c
index d1846d5f77ea..08da5aa3ea0d 100644
--- a/sys/dev/bwn/if_bwn_util.c
+++ b/sys/dev/bwn/if_bwn_util.c
@@ -34,6 +34,9 @@ __FBSDID("$FreeBSD$");
  * The Broadcom Wireless LAN controller driver.
  */
 
+#include "opt_bwn.h"
+#include "opt_wlan.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>