From c05fc1fe8ac29501625a9069e2474500bb257bdc Mon Sep 17 00:00:00 2001 From: coypu Date: Fri, 16 Sep 2016 06:03:53 +0300 Subject: [PATCH 07/27] KASSERTMSG like it's netbsd --- sys/external/isc/atheros_hal/dist/ah.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/external/isc/atheros_hal/dist/ah.c b/sys/external/isc/atheros_hal/dist/ah.c index 8333f10..5122717 100644 --- a/sys/external/isc/atheros_hal/dist/ah.c +++ b/sys/external/isc/atheros_hal/dist/ah.c @@ -297,9 +297,9 @@ ath_hal_pkt_txtime(struct ath_hal *ah, const HAL_RATE_TABLE *rates, uint32_t fra /* 11n frame - extract out the number of spatial streams */ numStreams = HT_RC_2_STREAMS(rc); - KASSERT(numStreams > 0 && numStreams <= 4, - ("number of spatial streams needs to be 1..3: MCS rate 0x%x!", - rateix)); + KASSERTMSG(numStreams > 0 && numStreams <= 4, + "number of spatial streams needs to be 1..3: MCS rate 0x%x!", + rateix); return ath_computedur_ht(frameLen, rc, numStreams, isht40, shortPreamble); } @@ -326,8 +326,8 @@ ath_computedur_ht(uint32_t frameLen, uint16_t rate, int streams, { uint32_t bitsPerSymbol, numBits, numSymbols, txTime; - KASSERT(rate & IEEE80211_RATE_MCS, ("not mcs %d", rate)); - KASSERT((rate &~ IEEE80211_RATE_MCS) < 31, ("bad mcs 0x%x", rate)); + KASSERTMSG(rate & IEEE80211_RATE_MCS, "not mcs %d", rate); + KASSERTMSG((rate &~ IEEE80211_RATE_MCS) < 31, "bad mcs 0x%x", rate); if (isht40) bitsPerSymbol = ht40_bps[rate & 0x1f]; -- 2.9.3