From owner-svn-src-all@freebsd.org Thu Jun 2 04:25:55 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DF90CB6351D; Thu, 2 Jun 2016 04:25:55 +0000 (UTC) (envelope-from adrian@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 mx1.freebsd.org (Postfix) with ESMTPS id B034B13AC; Thu, 2 Jun 2016 04:25:55 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u524Pso7097195; Thu, 2 Jun 2016 04:25:54 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u524PsN4097194; Thu, 2 Jun 2016 04:25:54 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201606020425.u524PsN4097194@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Thu, 2 Jun 2016 04:25:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r301186 - head/sys/dev/ath X-SVN-Group: head 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.22 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: Thu, 02 Jun 2016 04:25:56 -0000 Author: adrian Date: Thu Jun 2 04:25:54 2016 New Revision: 301186 URL: https://svnweb.freebsd.org/changeset/base/301186 Log: [ath] correctly shift the QCA9565 LNA config into the mci config variable. Tested: * QCA9565, STA + BT mode Modified: head/sys/dev/ath/if_ath_btcoex.c Modified: head/sys/dev/ath/if_ath_btcoex.c ============================================================================== --- head/sys/dev/ath/if_ath_btcoex.c Thu Jun 2 03:16:02 2016 (r301185) +++ head/sys/dev/ath/if_ath_btcoex.c Thu Jun 2 04:25:54 2016 (r301186) @@ -299,9 +299,13 @@ ath_btcoex_cfg_wb335b(struct ath_softc * * HAL correctly! */ if (sc->sc_pci_devinfo & ATH_PCI_AR9565_1ANT) { - flags |= ATH_MCI_ANT_ARCH_1_ANT_PA_LNA_SHARED; + flags &= ~ATH_MCI_CONFIG_ANT_ARCH; + flags |= ATH_MCI_ANT_ARCH_1_ANT_PA_LNA_SHARED << + ATH_MCI_CONFIG_ANT_ARCH_S; } else if (sc->sc_pci_devinfo & ATH_PCI_AR9565_2ANT) { - flags |= ATH_MCI_ANT_ARCH_2_ANT_PA_LNA_NON_SHARED; + flags &= ~ATH_MCI_CONFIG_ANT_ARCH; + flags |= ATH_MCI_ANT_ARCH_2_ANT_PA_LNA_NON_SHARED << + ATH_MCI_CONFIG_ANT_ARCH_S; } if (sc->sc_pci_devinfo & ATH_PCI_BT_ANT_DIV) {