Skip to content

Commit

Permalink
staging: brcm80211: removed unused softmac code after macro cleanup
Browse files Browse the repository at this point in the history
Since the macro's IS_MCS(0), RSPEC_STF(0) and PHY_TXC1_MODE_SISO all
expand to 0, inactive code could be removed.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Roland Vossen authored and Greg Kroah-Hartman committed Sep 12, 2011
1 parent 7266045 commit e046da4
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 28 deletions.
2 changes: 0 additions & 2 deletions drivers/staging/brcm80211/brcmsmac/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -5982,8 +5982,6 @@ int brcms_c_set_nmode(struct brcms_c_info *wlc, s32 nmode)
for (i = 0; i < wlc->pub->_nbands; i++) {
memset(wlc->bandstate[i]->hw_rateset.mcs, 0,
MCSSET_LEN);
if (IS_MCS(0))
brcms_c_reprate_init(wlc);
}
break;

Expand Down
26 changes: 0 additions & 26 deletions drivers/staging/brcm80211/brcmsmac/stf.c
Original file line number Diff line number Diff line change
Expand Up @@ -291,32 +291,6 @@ int brcms_c_stf_txchain_set(struct brcms_c_info *wlc, s32 int_val, bool force)
if (txstreams > MAX_STREAMS_SUPPORTED)
return -EINVAL;

if (txstreams == 1) {
for (i = 0; i < wlc->pub->_nbands; i++)
if ((RSPEC_STF(0) !=
PHY_TXC1_MODE_SISO)
|| (RSPEC_STF(0) !=
PHY_TXC1_MODE_SISO)) {
if (!force)
return -EBADE;

/* over-write the override rspec */
if (RSPEC_STF(0)
!= PHY_TXC1_MODE_SISO) {
wiphy_err(wlc->wiphy, "%s(): temp "
"sense override non-SISO "
"rspec_override\n",
__func__);
}
if (RSPEC_STF(0) != PHY_TXC1_MODE_SISO) {
wiphy_err(wlc->wiphy, "%s(): temp "
"sense override non-SISO "
"mrspec_override\n",
__func__);
}
}
}

wlc->stf->txchain = txchain;
wlc->stf->txstreams = txstreams;
brcms_c_stf_stbc_tx_set(wlc, wlc->band->band_stf_stbc_tx);
Expand Down

0 comments on commit e046da4

Please sign in to comment.