svn commit: r300448 - head/sys/gnu/dev/bwn/phy_n

[Adrian Chadd]

Author: adrian
Date: Mon May 23 04:17:27 2016
New Revision: 300448
URL: https://svnweb.freebsd.org/changeset/base/300448

Log:
  [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.

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	Mon May 23 04:07:41 2016	(r300447)
+++ head/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c	Mon May 23 04:17:27 2016	(r300448)
@@ -6635,16 +6635,12 @@ bwn_nphy_op_prepare_structs(struct bwn_m
 		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;
 		}