svn commit: r328098 - head/sys/dev/bwn

[Landon J. Fuller]

Author: landonf
Date: Wed Jan 17 22:33:19 2018
New Revision: 328098
URL: https://svnweb.freebsd.org/changeset/base/328098

Log:
  bwn(4): Enable, by default, the opt-in support for bhnd(4) introduced in
  r326454.
  
  bwn(4)/bhnd(4) has been tested with most chipsets currently supported by
  bwn(4), and this change should be transparent to existing bwn(4) users;
  please report any regressions that you do encounter.
  
  To revert to using siba_bwn(4) instead of bhnd(4), place the following
  lines in loader.conf(5):
  
    hw.bwn_pci.preferred="0"
  
  Once we're satisfied that the switch to bhnd(4) has seen sufficient broader
  testing, bwn(4) will be migrated to use the native bhnd(9) interface
  directly, and support for siba_bwn(4) will be dropped (see D13518).
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/dev/bwn/if_bwn.c
  head/sys/dev/bwn/if_bwn_pci.c

Modified: head/sys/dev/bwn/if_bwn.c
==============================================================================
--- head/sys/dev/bwn/if_bwn.c	Wed Jan 17 22:10:58 2018	(r328097)
+++ head/sys/dev/bwn/if_bwn.c	Wed Jan 17 22:33:19 2018	(r328098)
@@ -7493,6 +7493,7 @@ driver_t bwn_driver = {
 };
 static devclass_t bwn_devclass;
 DRIVER_MODULE(bwn, siba_bwn, bwn_driver, bwn_devclass, 0, 0);
+MODULE_DEPEND(bwn, bwn_pci, 1, 1, 1);
 MODULE_DEPEND(bwn, siba_bwn, 1, 1, 1);
 MODULE_DEPEND(bwn, gpiobus, 1, 1, 1);
 MODULE_DEPEND(bwn, wlan, 1, 1, 1);		/* 802.11 media layer */

Modified: head/sys/dev/bwn/if_bwn_pci.c
==============================================================================
--- head/sys/dev/bwn/if_bwn_pci.c	Wed Jan 17 22:10:58 2018	(r328097)
+++ head/sys/dev/bwn/if_bwn_pci.c	Wed Jan 17 22:33:19 2018	(r328098)
@@ -55,7 +55,7 @@ static int attach_untested = 0; 
 TUNABLE_INT("hw.bwn_pci.attach_untested", &attach_untested);
 
 /* If non-zero, probe at a higher priority than the stable if_bwn driver. */
-static int prefer_new_driver = 0; 
+static int prefer_new_driver = 1;
 TUNABLE_INT("hw.bwn_pci.preferred", &prefer_new_driver);
 
 /* SIBA Devices */
@@ -300,9 +300,9 @@ DRIVER_MODULE_ORDERED(bwn_pci, pci, bwn_pci_driver, bw
     NULL, SI_ORDER_ANY);
 DRIVER_MODULE(bhndb, bwn_pci, bhndb_pci_driver, bhndb_devclass, NULL, NULL);
 
-MODULE_DEPEND(bwn_pci, bwn, 1, 1, 1);
 MODULE_DEPEND(bwn_pci, bhnd, 1, 1, 1);
 MODULE_DEPEND(bwn_pci, bhndb, 1, 1, 1);
 MODULE_DEPEND(bwn_pci, bhndb_pci, 1, 1, 1);
 MODULE_DEPEND(bwn_pci, bcma_bhndb, 1, 1, 1);
 MODULE_DEPEND(bwn_pci, siba_bhndb, 1, 1, 1);
+MODULE_VERSION(bwn_pci, 1);