diff options
| author | Roland Vossen <rvossen@broadcom.com> | 2011-05-03 11:35:24 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-03 12:42:36 -0700 |
| commit | 5dfa128f42da6296e62a7387f16d213a308135ea (patch) | |
| tree | 1e9ca953613af16bf13130f79f238d2ced5d476a /drivers/staging/brcm80211/brcmsmac/wlc_rate.c | |
| parent | 5672cfa335d2518f3168ff1ad654d8e392181f51 (diff) | |
| download | linux-5dfa128f42da6296e62a7387f16d213a308135ea.tar.gz | |
staging: brcm80211: delete ASSERTs in 4 files in brcmsmac dir
wlc_antsel.c, wlc_channel.c, wlc_rate.c and wlc_stf.c are now
ASSERT free.
Cc: devel@linuxdriverproject.org
Cc: linux-wireless@vger.kernel.org
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmsmac/wlc_rate.c')
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_rate.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c index 8c1b8f0cad19..50a9fb594020 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c @@ -315,7 +315,6 @@ wlc_rate_hwrs_filter_sort_validate(wlc_rateset_t *rs, count = 0; for (i = 0; i < hw_rs->count; i++) { r = hw_rs->rates[i] & WLC_RATE_MASK; - ASSERT(r <= WLC_MAXRATE); if (rateset[r]) rs->rates[count++] = rateset[r]; } @@ -364,8 +363,7 @@ ratespec_t BCMFASTPATH wlc_compute_rspec(d11rxhdr_t *rxh, u8 *plcp) case PRXS0_STDN: /* fallthru */ default: - /* not supported */ - ASSERT(0); + /* not supported, error condition */ break; } if (PLCP3_ISSGI(plcp[3])) @@ -451,7 +449,7 @@ wlc_rateset_default(wlc_rateset_t *rs_tgt, const wlc_rateset_t *rs_hw, } else if (PHYTYPE_IS(phy_type, PHY_TYPE_G)) { rs_dflt = &cck_ofdm_rates; } else { - ASSERT(0); /* should not happen */ + /* should not happen, error condition */ rs_dflt = &cck_rates; /* force cck */ } |