diff options
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_channel.c | 2 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_mac80211.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/brcm80211/sys/wlc_channel.c b/drivers/staging/brcm80211/sys/wlc_channel.c index 1c3c043afbd..f92ff9712d7 100644 --- a/drivers/staging/brcm80211/sys/wlc_channel.c +++ b/drivers/staging/brcm80211/sys/wlc_channel.c @@ -1376,7 +1376,7 @@ wlc_channel_reg_limits(wlc_cm_info_t *wlc_cm, chanspec_t chanspec, /* Keep OFDM lmit below CCK limit */ if (BAND_2G(band->bandtype)) - maxpwr = min(maxpwr, txpwr->cck[0]); + maxpwr = min_t(int, maxpwr, txpwr->cck[0]); for (i = 0; i < WLC_NUM_RATES_OFDM; i++) { txpwr->ofdm[i] = (u8) maxpwr; diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c index 6ffbb02ad17..a5f7b9cdfa9 100644 --- a/drivers/staging/brcm80211/sys/wlc_mac80211.c +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c @@ -4806,7 +4806,7 @@ wlc_doiovar(void *hdl, const bcm_iovar_t *vi, u32 actionid, bool override; /* Remove override bit and clip to max qdbm value */ - qdbm = (u8)min((int_val & ~WL_TXPWR_OVERRIDE), 0xff); + qdbm = (u8)min_t(u32, (int_val & ~WL_TXPWR_OVERRIDE), 0xff); /* Extract override setting */ override = (int_val & WL_TXPWR_OVERRIDE) ? TRUE : FALSE; err = |