diff options
| author | Greg Kroah-Hartman | 2010-10-08 20:39:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-10-08 20:39:43 +0200 |
| commit | 3ea2f4d640479a40847e311282ee73695b6e82cf (patch) | |
| tree | 3aae5722cb9944b014b0181cc5dceac3a32bc8e3 /drivers/staging/brcm80211/sys | |
| parent | Staging: brcm80211: remove broken MIN() implementation (diff) | |
| download | kernel-qcow2-linux-3ea2f4d640479a40847e311282ee73695b6e82cf.tar.gz kernel-qcow2-linux-3ea2f4d640479a40847e311282ee73695b6e82cf.tar.xz kernel-qcow2-linux-3ea2f4d640479a40847e311282ee73695b6e82cf.zip | |
Staging: brcm80211: remove broken MAX() implementation
Use the kernel-provided version, this one is broken.
Note, there are more compiler warnings now, that's due to different
types being compared, which shows how the original macro was wrong in at
least one way. They need to be fixed up.
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/sys')
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_ampdu.c | 2 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_channel.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.c b/drivers/staging/brcm80211/sys/wlc_ampdu.c index f7e290401068..094ba2387cfa 100644 --- a/drivers/staging/brcm80211/sys/wlc_ampdu.c +++ b/drivers/staging/brcm80211/sys/wlc_ampdu.c @@ -761,7 +761,7 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec) plen = pkttotlen(osh, p) + AMPDU_MAX_MPDU_OVERHEAD; - plen = MAX(scb_ampdu->min_len, plen); + plen = max(scb_ampdu->min_len, plen); if ((plen + ampdu_len) > maxlen) { p = NULL; diff --git a/drivers/staging/brcm80211/sys/wlc_channel.c b/drivers/staging/brcm80211/sys/wlc_channel.c index 6795c20e39e8..a408bf6f109e 100644 --- a/drivers/staging/brcm80211/sys/wlc_channel.c +++ b/drivers/staging/brcm80211/sys/wlc_channel.c @@ -1355,7 +1355,7 @@ wlc_channel_reg_limits(wlc_cm_info_t *wlc_cm, chanspec_t chanspec, maxpwr = li->maxpwr[CHANNEL_POWER_IDX_2G_CCK(chan)]; maxpwr = maxpwr - delta; - maxpwr = MAX(maxpwr, 0); + maxpwr = max(maxpwr, 0); maxpwr = min(maxpwr, conducted_max); for (i = 0; i < WLC_NUM_RATES_CCK; i++) @@ -1371,7 +1371,7 @@ wlc_channel_reg_limits(wlc_cm_info_t *wlc_cm, chanspec_t chanspec, } maxpwr = maxpwr - delta; - maxpwr = MAX(maxpwr, 0); + maxpwr = max(maxpwr, 0); maxpwr = min(maxpwr, conducted_ofdm_max); /* Keep OFDM lmit below CCK limit */ @@ -1413,9 +1413,9 @@ wlc_channel_reg_limits(wlc_cm_info_t *wlc_cm, chanspec_t chanspec, maxpwr40 = li_mimo->maxpwr40[maxpwr_idx]; maxpwr20 = maxpwr20 - delta; - maxpwr20 = MAX(maxpwr20, 0); + maxpwr20 = max(maxpwr20, 0); maxpwr40 = maxpwr40 - delta; - maxpwr40 = MAX(maxpwr40, 0); + maxpwr40 = max(maxpwr40, 0); /* Fill in the MCS 0-7 (SISO) rates */ for (i = 0; i < WLC_NUM_RATES_MCS_1_STREAM; i++) { |