openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: brcm80211: removed asserts from dhd_cdc.c and dhd_common.c 

Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Roland Vossen 2011-07-06 00:02:34 +02:00 committed by Greg Kroah-Hartman
parent e16a73bc9e
commit 518ec3e963
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
View File

@ -288,8 +288,6 @@ brcmf_proto_ioctl(struct brcmf_pub *drvr, int ifidx, struct brcmf_ioctl *ioc,
BRCMF_TRACE(("%s: Enter\n", __func__));
ASSERT(len <= BRCMF_C_IOCTL_MAXLEN);
if (len > BRCMF_C_IOCTL_MAXLEN)
goto done;

21
drivers/staging/brcm80211/brcmfmac/dhd_common.c
View File

@ -272,7 +272,6 @@ bool brcmf_c_prec_enq(struct brcmf_pub *drvr, struct pktq *q,
eprec = prec;
else if (pktq_full(q)) {
p = brcmu_pktq_peek_tail(q, &eprec);
ASSERT(p);
if (eprec > prec)
return false;
}
@ -280,7 +279,6 @@ bool brcmf_c_prec_enq(struct brcmf_pub *drvr, struct pktq *q,
/* Evict if needed */
if (eprec >= 0) {
/* Detect queueing to unconfigured precedence */
ASSERT(!pktq_pempty(q, eprec));
discard_oldest = AC_BITMAP_TST(drvr->wme_dp, eprec);
if (eprec == prec && !discard_oldest)
return false; /* refuse newer (incoming) packet */
@ -290,9 +288,7 @@ bool brcmf_c_prec_enq(struct brcmf_pub *drvr, struct pktq *q,
if (p == NULL) {
BRCMF_ERROR(("%s: brcmu_pktq_penq() failed, oldest %d.",
__func__, discard_oldest));
ASSERT(p);
}
brcmu_pkt_buf_free_skb(p);
}
@ -300,10 +296,9 @@ bool brcmf_c_prec_enq(struct brcmf_pub *drvr, struct pktq *q,
p = brcmu_pktq_penq(q, prec, pkt);
if (p == NULL) {
BRCMF_ERROR(("%s: brcmu_pktq_penq() failed.", __func__));
ASSERT(p);
}
return true;
return p != NULL;
}
static int
@ -317,14 +312,16 @@ brcmf_c_iovar_op(struct brcmf_pub *drvr, const char *name,
BRCMF_TRACE(("%s: Enter\n", __func__));
ASSERT(name);
ASSERT(len >= 0);
if (name == NULL || len <= 0)
return -EINVAL;
/* Get MUST have return space */
ASSERT(set || (arg && len));
/* Set does not take qualifiers */
if (set && (params || plen))
return -EINVAL;
/* Set does NOT take qualifiers */
ASSERT(!set || (!params && !plen));
/* Get must have return space;*/
if (!set && !(arg && len))
return -EINVAL;
vi = brcmu_iovar_lookup(brcmf_iovars, name);
if (vi == NULL) {