diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-08 11:39:43 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-08 11:39:43 -0700 |
| commit | 3ea2f4d640479a40847e311282ee73695b6e82cf (patch) | |
| tree | 3aae5722cb9944b014b0181cc5dceac3a32bc8e3 /drivers/staging/brcm80211/brcmfmac | |
| parent | 7068c2f13983a39a49981891c47c74efb5fb60c7 (diff) | |
| download | op-kernel-dev-3ea2f4d640479a40847e311282ee73695b6e82cf.zip op-kernel-dev-3ea2f4d640479a40847e311282ee73695b6e82cf.tar.gz | |
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/brcmfmac')
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index a364e1e..f73e417 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c @@ -1680,7 +1680,7 @@ static int dhdsdio_pktgen_set(dhd_bus_t *bus, u8 *arg) bus->pktgen_stop = pktgen.stop; bus->pktgen_tick = bus->pktgen_ptick = 0; - bus->pktgen_len = MAX(bus->pktgen_len, bus->pktgen_minlen); + bus->pktgen_len = max(bus->pktgen_len, bus->pktgen_minlen); bus->pktgen_len = min(bus->pktgen_len, bus->pktgen_maxlen); /* Clear counts for a new pktgen (mode change, or was stopped) */ |
