lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: brcm80211: removed softmac ratespec override functionality

Browse Source 
This was unused.

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>
This commit is contained in:
Roland Vossen
2011-09-12 12:14:57 +02:00
committed by Greg Kroah-Hartman
parent db8cbbfd6d
commit 72660455c3
3 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/staging/brcm80211/brcmsmac/main.c
View File

@@ -5913,12 +5913,6 @@ int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config)
*/ */
if ((gmode == GMODE_LEGACY_B) && (band->gmode != GMODE_LEGACY_B)) { if ((gmode == GMODE_LEGACY_B) && (band->gmode != GMODE_LEGACY_B)) {
band->gmode = gmode; band->gmode = gmode;
if (band->rspec_override && !IS_CCK(band->rspec_override)) {
band->rspec_override = 0;
brcms_c_reprate_init(wlc);
}
if (band->mrspec_override && !IS_CCK(band->mrspec_override))
band->mrspec_override = 0;
} }
band->gmode = gmode; band->gmode = gmode;
@@ -5988,12 +5982,8 @@ int brcms_c_set_nmode(struct brcms_c_info *wlc, s32 nmode)
for (i = 0; i < wlc->pub->_nbands; i++) { for (i = 0; i < wlc->pub->_nbands; i++) {
memset(wlc->bandstate[i]->hw_rateset.mcs, 0, memset(wlc->bandstate[i]->hw_rateset.mcs, 0,
MCSSET_LEN); MCSSET_LEN);
if (IS_MCS(wlc->band->rspec_override)) { if (IS_MCS(0))
wlc->bandstate[i]->rspec_override = 0;
brcms_c_reprate_init(wlc); brcms_c_reprate_init(wlc);
}
if (IS_MCS(wlc->band->mrspec_override))
wlc->bandstate[i]->mrspec_override = 0;
} }
break; break;
@@ -7052,8 +7042,7 @@ done:
static u16 static u16
brcms_c_d11hdrs_mac80211(struct brcms_c_info *wlc, struct ieee80211_hw *hw, brcms_c_d11hdrs_mac80211(struct brcms_c_info *wlc, struct ieee80211_hw *hw,
struct sk_buff *p, struct scb *scb, uint frag, struct sk_buff *p, struct scb *scb, uint frag,
uint nfrags, uint queue, uint next_frag_len, uint nfrags, uint queue, uint next_frag_len)
u32 rspec_override)
{ {
struct ieee80211_hdr *h; struct ieee80211_hdr *h;
struct d11txh *txh; struct d11txh *txh;
@@ -7713,7 +7702,7 @@ void brcms_c_sendpkt_mac80211(struct brcms_c_info *wlc, struct sk_buff *sdu,
prio = ieee80211_is_data(d11_header->frame_control) ? sdu->priority : prio = ieee80211_is_data(d11_header->frame_control) ? sdu->priority :
MAXPRIO; MAXPRIO;
fifo = prio2fifo[prio]; fifo = prio2fifo[prio];
if (brcms_c_d11hdrs_mac80211(wlc, hw, sdu, scb, 0, 1, fifo, 0, 0)) if (brcms_c_d11hdrs_mac80211(wlc, hw, sdu, scb, 0, 1, fifo, 0))
return; return;
brcms_c_txq_enq(wlc, scb, sdu, BRCMS_PRIO_TO_PREC(prio)); brcms_c_txq_enq(wlc, scb, sdu, BRCMS_PRIO_TO_PREC(prio));
brcms_c_send_q(wlc); brcms_c_send_q(wlc);

2
drivers/staging/brcm80211/brcmsmac/main.h
View File

@@ -271,8 +271,6 @@ struct brcms_band {
/* band-specific copy of default_bss.rateset */ /* band-specific copy of default_bss.rateset */
struct brcms_c_rateset defrateset; struct brcms_c_rateset defrateset;
u32 rspec_override; /* 802.11 rate override */
u32 mrspec_override; /* multicast rate override */
u8 band_stf_ss_mode; /* Configured STF type, 0:siso; 1:cdd */ u8 band_stf_ss_mode; /* Configured STF type, 0:siso; 1:cdd */
s8 band_stf_stbc_tx; /* STBC TX 0:off; 1:force on; -1:auto */ s8 band_stf_stbc_tx; /* STBC TX 0:off; 1:force on; -1:auto */
/* rates supported by chip (phy-specific) */ /* rates supported by chip (phy-specific) */

12
drivers/staging/brcm80211/brcmsmac/stf.c
View File

@@ -293,26 +293,22 @@ int brcms_c_stf_txchain_set(struct brcms_c_info *wlc, s32 int_val, bool force)
if (txstreams == 1) { if (txstreams == 1) {
for (i = 0; i < wlc->pub->_nbands; i++) for (i = 0; i < wlc->pub->_nbands; i++)
if ((RSPEC_STF(wlc->bandstate[i]->rspec_override) != if ((RSPEC_STF(0) !=
PHY_TXC1_MODE_SISO) PHY_TXC1_MODE_SISO)
|| (RSPEC_STF(wlc->bandstate[i]->mrspec_override) != || (RSPEC_STF(0) !=
PHY_TXC1_MODE_SISO)) { PHY_TXC1_MODE_SISO)) {
if (!force) if (!force)
return -EBADE; return -EBADE;
/* over-write the override rspec */ /* over-write the override rspec */
if (RSPEC_STF(wlc->bandstate[i]->rspec_override) if (RSPEC_STF(0)
!= PHY_TXC1_MODE_SISO) { != PHY_TXC1_MODE_SISO) {
wlc->bandstate[i]->rspec_override = 0;
wiphy_err(wlc->wiphy, "%s(): temp " wiphy_err(wlc->wiphy, "%s(): temp "
"sense override non-SISO " "sense override non-SISO "
"rspec_override\n", "rspec_override\n",
__func__); __func__);
} }
if (RSPEC_STF if (RSPEC_STF(0) != PHY_TXC1_MODE_SISO) {
(wlc->bandstate[i]->mrspec_override) !=
PHY_TXC1_MODE_SISO) {
wlc->bandstate[i]->mrspec_override = 0;
wiphy_err(wlc->wiphy, "%s(): temp " wiphy_err(wlc->wiphy, "%s(): temp "
"sense override non-SISO " "sense override non-SISO "
"mrspec_override\n", "mrspec_override\n",