From owner-svn-src-head@freebsd.org  Tue Feb 13 17:43:54 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 B190DF14A37;
 Tue, 13 Feb 2018 17:43:54 +0000 (UTC)
 (envelope-from landonf@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 5F41486476;
 Tue, 13 Feb 2018 17:43:54 +0000 (UTC)
 (envelope-from landonf@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 5A33524039;
 Tue, 13 Feb 2018 17:43:54 +0000 (UTC)
 (envelope-from landonf@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1DHhsq6002138;
 Tue, 13 Feb 2018 17:43:54 GMT (envelope-from landonf@FreeBSD.org)
Received: (from landonf@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1DHhs3d002137;
 Tue, 13 Feb 2018 17:43:54 GMT (envelope-from landonf@FreeBSD.org)
Message-Id: <201802131743.w1DHhs3d002137@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: landonf set sender to
 landonf@FreeBSD.org using -f
From: "Landon J. Fuller" <landonf@FreeBSD.org>
Date: Tue, 13 Feb 2018 17:43:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r329228 - head/sys/gnu/dev/bwn/phy_n
X-SVN-Group: head
X-SVN-Commit-Author: landonf
X-SVN-Commit-Paths: head/sys/gnu/dev/bwn/phy_n
X-SVN-Commit-Revision: 329228
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Feb 2018 17:43:54 -0000

Author: landonf
Date: Tue Feb 13 17:43:54 2018
New Revision: 329228
URL: https://svnweb.freebsd.org/changeset/base/329228

Log:
  bwn(4): txpid2g/txpid5g[lh] are not defined after sromrev 7; the default
  indices into the TX power gain table should be used instead.
  
  This enables use of bwn(4) with later BCM4321 revisions.
  
  Reported by:	Trev Roydhouse

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	Tue Feb 13 17:42:16 2018	(r329227)
+++ head/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c	Tue Feb 13 17:43:54 2018	(r329228)
@@ -3906,6 +3906,9 @@ static int bwn_nphy_tx_power_fix(struct bwn_mac *mac)
 	} else if (sc->sc_board_info.board_srom_rev < 4) {
 		txpi[0] = 72;
 		txpi[1] = 72;
+	} else if (sc->sc_board_info.board_srom_rev > 7) {
+		txpi[0] = 0;
+		txpi[1] = 0;
 	} else {
 #define	BWN_NPHY_GET_TXPI(_name, _result)				\
 do {									\