diff options
| author | adrian <adrian@FreeBSD.org> | 2016-05-23 04:17:27 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2016-05-23 04:17:27 +0000 |
| commit | 084749803933b8c81eb935e4388afcf72bb7b8fd (patch) | |
| tree | dc15a70bcb80ffbbee94ff676732852abb0f63fe | |
| parent | 449997fe7179c511a77184ba892594b7c5128d5e (diff) | |
| download | FreeBSD-src-084749803933b8c81eb935e4388afcf72bb7b8fd.zip FreeBSD-src-084749803933b8c81eb935e4388afcf72bb7b8fd.tar.gz | |
[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.
| -rw-r--r-- | sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c b/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c index 1169585..cfc3104 100644 --- a/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c +++ b/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c @@ -6635,16 +6635,12 @@ bwn_nphy_op_prepare_structs(struct bwn_mac *mac) if (mac->mac_phy.rev >= 2 && (siba_sprom_get_bf2_lo(sc->sc_dev) & BWN_BFL2_TXPWRCTRL_EN)) { nphy->txpwrctrl = true; -#ifdef CONFIG_BWN_SSB - if (dev->dev->bus_type == BWN_BUS_SSB && - dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI) { - struct pci_dev *pdev = - dev->dev->sdev->bus->host_pci; - if (pdev->device == 0x4328 || - pdev->device == 0x432a) + if (bwn_is_bus_siba(mac) && + (siba_get_type(sc->sc_dev) == SIBA_TYPE_PCI)) { + if ((siba_get_pci_device(sc->sc_dev) == 0x4328) || + (siba_get_pci_device(sc->sc_dev) == 0x432a)) nphy->pwg_gain_5ghz = true; } -#endif } else if (siba_sprom_get_bf2_lo(sc->sc_dev) & BWN_BFL2_5G_PWRGAIN) { nphy->pwg_gain_5ghz = true; } |
