diff options
Diffstat (limited to 'sys/dev/ath/if_ath.c')
| -rw-r--r-- | sys/dev/ath/if_ath.c | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c index 1a30d5e..a0ebb4a 100644 --- a/sys/dev/ath/if_ath.c +++ b/sys/dev/ath/if_ath.c @@ -7267,34 +7267,12 @@ bad: static void ath_announce(struct ath_softc *sc) { -#define HAL_MODE_DUALBAND (HAL_MODE_11A|HAL_MODE_11B) struct ifnet *ifp = sc->sc_ifp; struct ath_hal *ah = sc->sc_ah; - u_int modes; - if_printf(ifp, "mac %d.%d phy %d.%d", - ah->ah_macVersion, ah->ah_macRev, - ah->ah_phyRev >> 4, ah->ah_phyRev & 0xf); - /* - * Print radio revision(s). We check the wireless modes - * to avoid falsely printing revs for inoperable parts. - * Dual-band radio revs are returned in the 5Ghz rev number. - */ - modes = ath_hal_getwirelessmodes(ah); - if ((modes & HAL_MODE_DUALBAND) == HAL_MODE_DUALBAND) { - if (ah->ah_analog5GhzRev && ah->ah_analog2GhzRev) - printf(" 5ghz radio %d.%d 2ghz radio %d.%d", - ah->ah_analog5GhzRev >> 4, - ah->ah_analog5GhzRev & 0xf, - ah->ah_analog2GhzRev >> 4, - ah->ah_analog2GhzRev & 0xf); - else - printf(" radio %d.%d", ah->ah_analog5GhzRev >> 4, - ah->ah_analog5GhzRev & 0xf); - } else - printf(" radio %d.%d", ah->ah_analog5GhzRev >> 4, - ah->ah_analog5GhzRev & 0xf); - printf("\n"); + if_printf(ifp, "AR%s mac %d.%d RF%s phy %d.%d\n", + ath_hal_mac_name(ah), ah->ah_macVersion, ah->ah_macRev, + ath_hal_rf_name(ah), ah->ah_phyRev >> 4, ah->ah_phyRev & 0xf); if (bootverbose) { int i; for (i = 0; i <= WME_AC_VO; i++) { @@ -7310,7 +7288,6 @@ ath_announce(struct ath_softc *sc) if_printf(ifp, "using %u rx buffers\n", ath_rxbuf); if (ath_txbuf != ATH_TXBUF) if_printf(ifp, "using %u tx buffers\n", ath_txbuf); -#undef HAL_MODE_DUALBAND } #ifdef ATH_SUPPORT_TDMA |
