Skip to content

Commit

Permalink
Staging: brcm80211: remove broken MIN() implementation
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Greg Kroah-Hartman committed Oct 8, 2010
1 parent c03b63c commit 7068c2f
Show file tree
Hide file tree
Showing 15 changed files with 76 additions and 81 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/brcm80211/brcmfmac/bcmutils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ uint pktcopy(osl_t *osh, void *p, uint offset, int len, unsigned char * buf)

/* copy the data */
for (; p && len; p = PKTNEXT(p)) {
n = MIN((uint) PKTLEN(p) - offset, (uint) len);
n = min((uint) PKTLEN(p) - offset, (uint) len);
bcopy(PKTDATA(p) + offset, buf, n);
buf += n;
len -= n;
Expand Down Expand Up @@ -89,7 +89,7 @@ uint pktfrombuf(osl_t *osh, void *p, uint offset, int len, unsigned char *buf)

/* copy the data */
for (; p && len; p = PKTNEXT(p)) {
n = MIN((uint) PKTLEN(p) - offset, (uint) len);
n = min((uint) PKTLEN(p) - offset, (uint) len);
bcopy(buf, PKTDATA(p) + offset, n);
buf += n;
len -= n;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/brcm80211/brcmfmac/dhd_linux.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1682,7 +1682,7 @@ static int dhd_ioctl_entry(struct net_device *net, struct ifreq *ifr, int cmd)

/* Copy out any buffer passed */
if (ioc.buf) {
buflen = MIN(ioc.len, DHD_IOCTL_MAXLEN);
buflen = min(ioc.len, DHD_IOCTL_MAXLEN);
/* optimization for direct ioctl calls from kernel */
/*
if (segment_eq(get_fs(), KERNEL_DS)) {
Expand Down
26 changes: 13 additions & 13 deletions drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -979,7 +979,7 @@ static int dhdsdio_txpkt(dhd_bus_t *bus, void *pkt, uint chan, bool free_pkt)
(DHD_DATA_ON() && (chan != SDPCM_CONTROL_CHANNEL))))) {
prhex("Tx Frame", frame, len);
} else if (DHD_HDRS_ON()) {
prhex("TxHdr", frame, MIN(len, 16));
prhex("TxHdr", frame, min(len, 16));
}
#endif

Expand Down Expand Up @@ -1312,7 +1312,7 @@ int dhd_bus_txctl(struct dhd_bus *bus, unsigned char *msg, uint msglen)
if (DHD_BYTES_ON() && DHD_CTL_ON())
prhex("Tx Frame", frame, len);
else if (DHD_HDRS_ON())
prhex("TxHdr", frame, MIN(len, 16));
prhex("TxHdr", frame, min(len, 16));
#endif

do {
Expand Down Expand Up @@ -1390,7 +1390,7 @@ int dhd_bus_rxctl(struct dhd_bus *bus, unsigned char *msg, uint msglen)

dhd_os_sdlock(bus->dhd);
rxlen = bus->rxlen;
bcopy(bus->rxctl, msg, MIN(msglen, rxlen));
bcopy(bus->rxctl, msg, min(msglen, rxlen));
bus->rxlen = 0;
dhd_os_sdunlock(bus->dhd);

Expand Down Expand Up @@ -1681,7 +1681,7 @@ static int dhdsdio_pktgen_set(dhd_bus_t *bus, u8 *arg)

bus->pktgen_tick = bus->pktgen_ptick = 0;
bus->pktgen_len = MAX(bus->pktgen_len, bus->pktgen_minlen);
bus->pktgen_len = MIN(bus->pktgen_len, bus->pktgen_maxlen);
bus->pktgen_len = min(bus->pktgen_len, bus->pktgen_maxlen);

/* Clear counts for a new pktgen (mode change, or was stopped) */
if (bus->pktgen_count && (!oldcnt || oldmode != bus->pktgen_mode))
Expand Down Expand Up @@ -1737,7 +1737,7 @@ dhdsdio_membytes(dhd_bus_t *bus, bool write, u32 address, u8 *data,
break;
}
sdaddr = 0;
dsize = MIN(SBSDIO_SB_OFT_ADDR_LIMIT, size);
dsize = min(SBSDIO_SB_OFT_ADDR_LIMIT, size);
}
}

Expand Down Expand Up @@ -1954,7 +1954,7 @@ static int dhdsdio_mem_dump(dhd_bus_t *bus)
printf("Dump dongle memory");
databuf = buf;
while (size) {
read_size = MIN(MEMBLOCK, size);
read_size = min(MEMBLOCK, size);
ret = dhdsdio_membytes(bus, FALSE, start, databuf, read_size);
if (ret) {
printf("%s: Error membytes %d\n", __func__, ret);
Expand Down Expand Up @@ -2781,7 +2781,7 @@ dhd_bus_iovar_op(dhd_pub_t *dhdp, const char *name,
bus->blocksize));
}
}
bus->roundup = MIN(max_roundup, bus->blocksize);
bus->roundup = min(max_roundup, bus->blocksize);

if ((bus->idletime == DHD_IDLE_IMMEDIATE) && !bus->dpc_sched) {
bus->activity = FALSE;
Expand Down Expand Up @@ -3355,7 +3355,7 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
#ifdef DHD_DEBUG
if (DHD_GLOM_ON()) {
prhex("SUPERFRAME", PKTDATA(pfirst),
MIN(PKTLEN(pfirst), 48));
min(PKTLEN(pfirst), 48));
}
#endif

Expand Down Expand Up @@ -3559,7 +3559,7 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
PKTLEN(pfirst), PKTNEXT(pfirst),
PKTLINK(pfirst)));
prhex("", (u8 *) PKTDATA(pfirst),
MIN(PKTLEN(pfirst), 32));
min(PKTLEN(pfirst), 32));
}
#endif /* DHD_DEBUG */
}
Expand Down Expand Up @@ -4432,7 +4432,7 @@ bool dhdsdio_dpc(dhd_bus_t *bus)
framecnt = dhdsdio_readframes(bus, rxlimit, &rxdone);
if (rxdone || bus->rxskip)
intstatus &= ~I_HMB_FRAME_IND;
rxlimit -= MIN(framecnt, rxlimit);
rxlimit -= min(framecnt, rxlimit);
}

/* Keep still-pending events for next scheduling */
Expand Down Expand Up @@ -4503,7 +4503,7 @@ bool dhdsdio_dpc(dhd_bus_t *bus)
else if ((bus->clkstate == CLK_AVAIL) && !bus->fcstate &&
pktq_mlen(&bus->txq, ~bus->flowcontrol) && txlimit
&& DATAOK(bus)) {
framecnt = rxdone ? txlimit : MIN(txlimit, dhd_txminmax);
framecnt = rxdone ? txlimit : min(txlimit, dhd_txminmax);
framecnt = dhdsdio_sendfromq(bus, framecnt);
txlimit -= framecnt;
}
Expand Down Expand Up @@ -4605,7 +4605,7 @@ static void dhdsdio_pktgen_init(dhd_bus_t *bus)
{
/* Default to specified length, or full range */
if (dhd_pktgen_len) {
bus->pktgen_maxlen = MIN(dhd_pktgen_len, MAX_PKTGEN_LEN);
bus->pktgen_maxlen = min(dhd_pktgen_len, MAX_PKTGEN_LEN);
bus->pktgen_minlen = bus->pktgen_maxlen;
} else {
bus->pktgen_maxlen = MAX_PKTGEN_LEN;
Expand Down Expand Up @@ -5498,7 +5498,7 @@ static bool dhdsdio_probe_init(dhd_bus_t *bus, osl_t *osh, void *sdh)
DHD_INFO(("%s: Initial value for %s is %d\n",
__func__, "sd_blocksize", bus->blocksize));
}
bus->roundup = MIN(max_roundup, bus->blocksize);
bus->roundup = min(max_roundup, bus->blocksize);

/* Query if bus module supports packet chaining,
default to use if supported */
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
ssids->ssid, ssids->ssid_len));
memset(&sr->ssid, 0, sizeof(sr->ssid));
sr->ssid.SSID_len =
MIN(sizeof(sr->ssid.SSID), ssids->ssid_len);
min(sizeof(sr->ssid.SSID), ssids->ssid_len);
if (sr->ssid.SSID_len) {
memcpy(sr->ssid.SSID, ssids->ssid, sr->ssid.SSID_len);
sr->ssid.SSID_len = htod32(sr->ssid.SSID_len);
Expand Down Expand Up @@ -1361,7 +1361,7 @@ wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
** If SSID is zero join based on BSSID only
*/
memset(&ssid, 0, sizeof(ssid));
ssid.SSID_len = MIN(sizeof(ssid.SSID), sme->ssid_len);
ssid.SSID_len = min(sizeof(ssid.SSID), sme->ssid_len);
memcpy(ssid.SSID, sme->ssid, ssid.SSID_len);
ssid.SSID_len = htod32(ssid.SSID_len);
wl_update_prof(wl, NULL, &ssid, WL_PROF_SSID);
Expand Down Expand Up @@ -1754,7 +1754,7 @@ wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
key.index = key_idx;
swap_key_to_BE(&key);
memset(&params, 0, sizeof(params));
params.key_len = (u8) MIN(DOT11_MAX_KEY_SIZE, key.len);
params.key_len = (u8) min(DOT11_MAX_KEY_SIZE, key.len);
memcpy(params.key, key.data, params.key_len);

err = wl_dev_ioctl(dev, WLC_GET_WSEC, &wsec, sizeof(wsec));
Expand Down
12 changes: 6 additions & 6 deletions drivers/staging/brcm80211/brcmfmac/wl_iw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ wl_iw_set_spy(struct net_device *dev,
if (!extra)
return -EINVAL;

iw->spy_num = MIN(ARRAYSIZE(iw->spy_addr), dwrq->length);
iw->spy_num = min(ARRAYSIZE(iw->spy_addr), dwrq->length);
for (i = 0; i < iw->spy_num; i++)
memcpy(&iw->spy_addr[i], addr[i].sa_data, ETHER_ADDR_LEN);
memset(iw->spy_qual, 0, sizeof(iw->spy_qual));
Expand Down Expand Up @@ -1291,7 +1291,7 @@ wl_iw_set_scan(struct net_device *dev,
return -EBUSY;
} else {
g_specific_ssid.SSID_len =
MIN(sizeof(g_specific_ssid.SSID),
min(sizeof(g_specific_ssid.SSID),
req->essid_len);
memcpy(g_specific_ssid.SSID, req->essid,
g_specific_ssid.SSID_len);
Expand Down Expand Up @@ -1389,7 +1389,7 @@ wl_iw_iscan_set_scan(struct net_device *dev,
if (wrqu->data.length == sizeof(struct iw_scan_req)) {
if (wrqu->data.flags & IW_SCAN_THIS_ESSID) {
struct iw_scan_req *req = (struct iw_scan_req *)extra;
ssid.SSID_len = MIN(sizeof(ssid.SSID), req->essid_len);
ssid.SSID_len = min(sizeof(ssid.SSID), req->essid_len);
memcpy(ssid.SSID, req->essid, ssid.SSID_len);
ssid.SSID_len = htod32(ssid.SSID_len);
} else {
Expand Down Expand Up @@ -1918,9 +1918,9 @@ wl_iw_set_essid(struct net_device *dev,

if (dwrq->length && extra) {
#if WIRELESS_EXT > 20
g_ssid.SSID_len = MIN(sizeof(g_ssid.SSID), dwrq->length);
g_ssid.SSID_len = min(sizeof(g_ssid.SSID), dwrq->length);
#else
g_ssid.SSID_len = MIN(sizeof(g_ssid.SSID), dwrq->length - 1);
g_ssid.SSID_len = min(sizeof(g_ssid.SSID), dwrq->length - 1);
#endif
memcpy(g_ssid.SSID, extra, g_ssid.SSID_len);
} else {
Expand Down Expand Up @@ -2453,7 +2453,7 @@ wl_iw_get_encode(struct net_device *dev,

wsec = dtoh32(wsec);
auth = dtoh32(auth);
dwrq->length = MIN(DOT11_MAX_KEY_SIZE, key.len);
dwrq->length = min(DOT11_MAX_KEY_SIZE, key.len);

dwrq->flags = key.index + 1;
if (!(wsec & (WEP_ENABLED | TKIP_ENABLED | AES_ENABLED)))
Expand Down
4 changes: 0 additions & 4 deletions drivers/staging/brcm80211/include/bcmutils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,10 +449,6 @@ extern "C" {
#define ABS(a) (((a) < 0) ? -(a) : (a))
#endif /* ABS */

#ifndef MIN
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
#endif /* MIN */

#ifndef MAX
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
#endif /* MAX */
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/brcm80211/include/wlioctl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1212,7 +1212,7 @@ typedef struct wl_po {
u16 mcspo[8];
} wl_po_t;

/* 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 */
Expand Down
16 changes: 8 additions & 8 deletions drivers/staging/brcm80211/phy/wlc_phy_cmn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1775,7 +1775,7 @@ wlc_phy_txpower_sromlimit_max_get(wlc_phy_t *ppi, uint chan, u8 *max_txpwr,
maxtxpwr = (maxtxpwr > 6) ? (maxtxpwr - 6) : 0;

tx_pwr_max = MAX(tx_pwr_max, maxtxpwr);
tx_pwr_min = MIN(tx_pwr_min, maxtxpwr);
tx_pwr_min = min(tx_pwr_min, maxtxpwr);
}
*max_txpwr = tx_pwr_max;
*min_txpwr = tx_pwr_min;
Expand Down Expand Up @@ -1873,14 +1873,14 @@ void wlc_phy_txpower_recalc_target(phy_info_t *pi)
wlc_phy_txpower_sromlimit((wlc_phy_t *) pi, target_chan,
&mintxpwr, &maxtxpwr, rate);

maxtxpwr = MIN(maxtxpwr, pi->txpwr_limit[rate]);
maxtxpwr = min(maxtxpwr, pi->txpwr_limit[rate]);

maxtxpwr =
(maxtxpwr > pactrl) ? (maxtxpwr - pactrl) : 0;

maxtxpwr = (maxtxpwr > 6) ? (maxtxpwr - 6) : 0;

maxtxpwr = MIN(maxtxpwr, tx_pwr_target[rate]);
maxtxpwr = min(maxtxpwr, tx_pwr_target[rate]);

if (pi->txpwr_percent <= 100)
maxtxpwr = (maxtxpwr * pi->txpwr_percent) / 100;
Expand All @@ -1889,13 +1889,13 @@ void wlc_phy_txpower_recalc_target(phy_info_t *pi)
}

tx_pwr_target[rate] =
MIN(tx_pwr_target[rate], pi->txpwr_env_limit[rate]);
min(tx_pwr_target[rate], pi->txpwr_env_limit[rate]);

if (tx_pwr_target[rate] > tx_pwr_max)
tx_pwr_max_rate_ind = rate;

tx_pwr_max = MAX(tx_pwr_max, tx_pwr_target[rate]);
tx_pwr_min = MIN(tx_pwr_min, tx_pwr_target[rate]);
tx_pwr_min = min(tx_pwr_min, tx_pwr_target[rate]);
}

bzero(pi->tx_power_offset, sizeof(pi->tx_power_offset));
Expand Down Expand Up @@ -1978,7 +1978,7 @@ wlc_phy_txpower_reg_limit_calc(phy_info_t *pi, struct txpwr_limits *txpwr,
for (rate1 = rate_start_index, rate2 = 0;
rate2 < WLC_NUM_RATES_OFDM; rate1++, rate2++)
pi->txpwr_limit[rate1] =
MIN(txpwr_ptr2[rate2],
min(txpwr_ptr2[rate2],
tmp_txpwr_limit[rate2]);
}

Expand Down Expand Up @@ -2021,7 +2021,7 @@ wlc_phy_txpower_reg_limit_calc(phy_info_t *pi, struct txpwr_limits *txpwr,
rate2 < WLC_NUM_RATES_MCS_1_STREAM;
rate1++, rate2++)
pi->txpwr_limit[rate1] =
MIN(txpwr_ptr2[rate2],
min(txpwr_ptr2[rate2],
tmp_txpwr_limit[rate2]);
}

Expand Down Expand Up @@ -2066,7 +2066,7 @@ wlc_phy_txpower_reg_limit_calc(phy_info_t *pi, struct txpwr_limits *txpwr,
pi->txpwr_limit[WL_TX_POWER_MCS_32] = txpwr->mcs32;

pi->txpwr_limit[WL_TX_POWER_MCS40_CDD_FIRST] =
MIN(pi->txpwr_limit[WL_TX_POWER_MCS40_CDD_FIRST],
min(pi->txpwr_limit[WL_TX_POWER_MCS40_CDD_FIRST],
pi->txpwr_limit[WL_TX_POWER_MCS_32]);
pi->txpwr_limit[WL_TX_POWER_MCS_32] =
pi->txpwr_limit[WL_TX_POWER_MCS40_CDD_FIRST];
Expand Down
22 changes: 11 additions & 11 deletions drivers/staging/brcm80211/phy/wlc_phy_n.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21357,7 +21357,7 @@ static void wlc_phy_rssi_cal_nphy_rev2(phy_info_t *pi, u8 rssi_type)
|| (rssi_type == NPHY_RSSI_SEL_W2)) {
for (ctr = 0; ctr < 2; ctr++) {
poll_miniq[vcm][ctr] =
MIN(poll_results[vcm][ctr * 2 + 0],
min(poll_results[vcm][ctr * 2 + 0],
poll_results[vcm][ctr * 2 + 1]);
}
}
Expand Down Expand Up @@ -25492,7 +25492,7 @@ wlc_phy_rxcal_gainctrl_nphy_rev5(phy_info_t *pi, u8 rx_core,
(lna2 << 2) | lna1), 0x3,
0);
} else {
hpvga = (u16) MAX(MIN(((int)hpvga) + delta_pwr, 10), 0);
hpvga = (u16) MAX(min(((int)hpvga) + delta_pwr, 10), 0);
wlc_phy_rfctrl_override_nphy(pi, (0x1 << 12),
((hpvga << 12) | (lpf_biq1 << 10) |
(lpf_biq0 << 8) | (mix_tia_gain <<
Expand Down Expand Up @@ -25877,8 +25877,8 @@ wlc_phy_cal_rxiq_nphy_rev3(phy_info_t *pi, nphy_txgains_t target_gain,
TXLPF_IDAC_4, txlpf_idac);
}

rxlpf_rccal_hpc = MAX(MIN(rxlpf_rccal_hpc, 31), 0);
txlpf_rccal_lpc = MAX(MIN(txlpf_rccal_lpc, 31), 0);
rxlpf_rccal_hpc = MAX(min(rxlpf_rccal_hpc, 31), 0);
txlpf_rccal_lpc = MAX(min(txlpf_rccal_lpc, 31), 0);

write_radio_reg(pi, (RADIO_2056_RX_RXLPF_RCCAL_HPC |
((rx_core ==
Expand Down Expand Up @@ -26060,7 +26060,7 @@ wlc_phy_cal_rxiq_nphy_rev2(phy_info_t *pi, nphy_txgains_t target_gain,

hpf_change = desired_log2_pwr - actual_log2_pwr;
curr_hpf += hpf_change;
curr_hpf = MAX(MIN(curr_hpf, 10), 0);
curr_hpf = MAX(min(curr_hpf, 10), 0);
if (use_hpf_num == 1) {
curr_hpf1 = curr_hpf;
} else {
Expand Down Expand Up @@ -26745,8 +26745,8 @@ wlc_phy_a1_nphy(phy_info_t *pi, u8 core, u32 winsz, u32 start,
u32 phy_a1, phy_a2;
s32 phy_a3, phy_a4, phy_a5, phy_a6, phy_a7;

phy_a1 = end - MIN(end, (winsz >> 1));
phy_a2 = MIN(NPHY_PAPD_EPS_TBL_SIZE - 1, end + (winsz >> 1));
phy_a1 = end - min(end, (winsz >> 1));
phy_a2 = min(NPHY_PAPD_EPS_TBL_SIZE - 1, end + (winsz >> 1));
phy_a3 = phy_a2 - phy_a1 + 1;
phy_a6 = 0;
phy_a7 = 0;
Expand Down Expand Up @@ -27754,7 +27754,7 @@ void BCMNMIATTACHFN(wlc_phy_txpwr_apply_nphy) (phy_info_t *pi)
switch (band_num) {
case 0:

tmp_max_pwr = MIN(pi->nphy_pwrctrl_info[0].max_pwr_2g,
tmp_max_pwr = min(pi->nphy_pwrctrl_info[0].max_pwr_2g,
pi->nphy_pwrctrl_info[1].max_pwr_2g);

pwr_offsets1[0] = pi->cck2gpo;
Expand All @@ -27778,7 +27778,7 @@ void BCMNMIATTACHFN(wlc_phy_txpwr_apply_nphy) (phy_info_t *pi)
break;
case 1:

tmp_max_pwr = MIN(pi->nphy_pwrctrl_info[0].max_pwr_5gm,
tmp_max_pwr = min(pi->nphy_pwrctrl_info[0].max_pwr_5gm,
pi->nphy_pwrctrl_info[1].max_pwr_5gm);

pwr_offsets1[0] = (u16) (pi->ofdm5gpo & 0xffff);
Expand All @@ -27795,7 +27795,7 @@ void BCMNMIATTACHFN(wlc_phy_txpwr_apply_nphy) (phy_info_t *pi)
break;
case 2:

tmp_max_pwr = MIN(pi->nphy_pwrctrl_info[0].max_pwr_5gl,
tmp_max_pwr = min(pi->nphy_pwrctrl_info[0].max_pwr_5gl,
pi->nphy_pwrctrl_info[1].max_pwr_5gl);

pwr_offsets1[0] = (u16) (pi->ofdm5glpo & 0xffff);
Expand All @@ -27812,7 +27812,7 @@ void BCMNMIATTACHFN(wlc_phy_txpwr_apply_nphy) (phy_info_t *pi)
break;
case 3:

tmp_max_pwr = MIN(pi->nphy_pwrctrl_info[0].max_pwr_5gh,
tmp_max_pwr = min(pi->nphy_pwrctrl_info[0].max_pwr_5gh,
pi->nphy_pwrctrl_info[1].max_pwr_5gh);

pwr_offsets1[0] = (u16) (pi->ofdm5ghpo & 0xffff);
Expand Down
Loading

0 comments on commit 7068c2f

Please sign in to comment.