Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 May 2016 04:48:13 +0000 (UTC)
From:      Adrian Chadd <adrian@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r300192 - head/sys/gnu/dev/bwn/phy_n
Message-ID:  <201605190448.u4J4mDqi072205@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adrian
Date: Thu May 19 04:48:13 2016
New Revision: 300192
URL: https://svnweb.freebsd.org/changeset/base/300192

Log:
  [bwn] disable rfon checks so the 2056/2057 radios are programmed.
  
  This was the big missing piece for getting the BCM94322MC NIC
  to work at all.
  
  Tested:
  
  * BCM4322, STA mode (2g, 5g)

Modified:
  head/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c

Modified: head/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c
==============================================================================
--- head/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c	Thu May 19 04:46:21 2016	(r300191)
+++ head/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c	Thu May 19 04:48:13 2016	(r300192)
@@ -6743,15 +6743,21 @@ bwn_nphy_op_software_rfkill(struct bwn_m
 	    "%s: called; rev=%d, rf_on=%d, active=%d\n", __func__,
 	    phy->rev, mac->mac_phy.rf_on, active);
 
+	/*
+	 * XXX TODO: don't bother doing RF programming if it's
+	 * already done.  But, bwn(4) currently sets rf_on in the
+	 * PHY setup and leaves it on after startup, which causes
+	 * the below to not init the 2056/2057 radios.
+	 */
 	if (active) {
 		if (phy->rev >= 19) {
 			/* TODO */
 		} else if (phy->rev >= 7) {
-			if (!mac->mac_phy.rf_on)
+//			if (!mac->mac_phy.rf_on)
 				bwn_radio_2057_init(mac);
 			bwn_switch_channel(mac, bwn_get_chan(mac));
 		} else if (phy->rev >= 3) {
-			if (!mac->mac_phy.rf_on)
+//			if (!mac->mac_phy.rf_on)
 				bwn_radio_init2056(mac);
 			bwn_switch_channel(mac, bwn_get_chan(mac));
 		} else {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605190448.u4J4mDqi072205>