diff options
| author | Greg Kroah-Hartman | 2010-10-08 20:34:59 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-10-08 20:34:59 +0200 |
| commit | 7068c2f13983a39a49981891c47c74efb5fb60c7 (patch) | |
| tree | db1b9423b6001fb94dbea1f536765156b27797dd /drivers/staging/brcm80211/sys/wlc_pub.h | |
| parent | Staging: brcm80211: util: remove unneeded usage of uintptr (diff) | |
| download | kernel-qcow2-linux-7068c2f13983a39a49981891c47c74efb5fb60c7.tar.gz kernel-qcow2-linux-7068c2f13983a39a49981891c47c74efb5fb60c7.tar.xz kernel-qcow2-linux-7068c2f13983a39a49981891c47c74efb5fb60c7.zip | |
Staging: brcm80211: remove broken MIN() 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/wlc_pub.h')
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_pub.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/brcm80211/sys/wlc_pub.h b/drivers/staging/brcm80211/sys/wlc_pub.h index bcb30cd0cc33..d5f1bade0301 100644 --- a/drivers/staging/brcm80211/sys/wlc_pub.h +++ b/drivers/staging/brcm80211/sys/wlc_pub.h @@ -57,7 +57,7 @@ #define WLC_SNR_INVALID 0 /* invalid SNR value */ -/* a large TX Power as an init value to factor out of MIN() calculations, +/* a large TX Power as an init value to factor out of min() calculations, * keep low enough to fit in an s8, units are .25 dBm */ #define WLC_TXPWR_MAX (127) /* ~32 dBm = 1,500 mW */ @@ -456,7 +456,7 @@ extern const u8 wlc_prio2prec_map[]; /* This maps priority to one precedence higher - Used by PS-Poll response packets to * simulate enqueue-at-head operation, but still maintain the order on the queue */ -#define WLC_PRIO_TO_HI_PREC(pri) MIN(WLC_PRIO_TO_PREC(pri) + 1, WLC_PREC_COUNT - 1) +#define WLC_PRIO_TO_HI_PREC(pri) min(WLC_PRIO_TO_PREC(pri) + 1, WLC_PREC_COUNT - 1) extern const u8 wme_fifo2ac[]; #define WME_PRIO2AC(prio) wme_fifo2ac[prio2fifo[(prio)]] |