[bwn] convert another PHY-N workaround to the freebsd bwn format.

These were hidden behind an #ifdef that we weren't setting.

I don't have the hardware in question to check.
This commit is contained in:
adrian 2016-05-23 04:17:27 +00:00
parent 449997fe71
commit 0847498039

View File

@ -6635,16 +6635,12 @@ bwn_nphy_op_prepare_structs(struct bwn_mac *mac)
if (mac->mac_phy.rev >= 2 && if (mac->mac_phy.rev >= 2 &&
(siba_sprom_get_bf2_lo(sc->sc_dev) & BWN_BFL2_TXPWRCTRL_EN)) { (siba_sprom_get_bf2_lo(sc->sc_dev) & BWN_BFL2_TXPWRCTRL_EN)) {
nphy->txpwrctrl = true; nphy->txpwrctrl = true;
#ifdef CONFIG_BWN_SSB if (bwn_is_bus_siba(mac) &&
if (dev->dev->bus_type == BWN_BUS_SSB && (siba_get_type(sc->sc_dev) == SIBA_TYPE_PCI)) {
dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI) { if ((siba_get_pci_device(sc->sc_dev) == 0x4328) ||
struct pci_dev *pdev = (siba_get_pci_device(sc->sc_dev) == 0x432a))
dev->dev->sdev->bus->host_pci;
if (pdev->device == 0x4328 ||
pdev->device == 0x432a)
nphy->pwg_gain_5ghz = true; nphy->pwg_gain_5ghz = true;
} }
#endif
} else if (siba_sprom_get_bf2_lo(sc->sc_dev) & BWN_BFL2_5G_PWRGAIN) { } else if (siba_sprom_get_bf2_lo(sc->sc_dev) & BWN_BFL2_5G_PWRGAIN) {
nphy->pwg_gain_5ghz = true; nphy->pwg_gain_5ghz = true;
} }