staging: brcm80211: remove ht_cap field from brcms_c_info structure
The field ht_cap was typed ieee80211_ht_cap from ieee80211.h. This contained little endian annotated field cap_info resulting in sparse endian warnings. It turned out the driver was setting the field, but it was actually never used. Therefore it has been removed. Reported-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Roland Vossen <rvossen@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
261f992bce
commit
3215b49415
|
@ -325,11 +325,6 @@ static u16 frametype(u32 rspec, u8 mimoframe)
|
||||||
*/
|
*/
|
||||||
#define SSID_FMT_BUF_LEN ((4 * IEEE80211_MAX_SSID_LEN) + 1)
|
#define SSID_FMT_BUF_LEN ((4 * IEEE80211_MAX_SSID_LEN) + 1)
|
||||||
|
|
||||||
/* defaults for the HT (MIMO) bss */
|
|
||||||
#define HT_CAP (IEEE80211_HT_CAP_SM_PS |\
|
|
||||||
IEEE80211_HT_CAP_SUP_WIDTH_20_40 | IEEE80211_HT_CAP_GRN_FLD |\
|
|
||||||
IEEE80211_HT_CAP_MAX_AMSDU | IEEE80211_HT_CAP_DSSSCCK40)
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The following table lists the buffer memory allocated to xmt fifos in HW.
|
* The following table lists the buffer memory allocated to xmt fifos in HW.
|
||||||
* the size is in units of 256bytes(one block), total size is HW dependent
|
* the size is in units of 256bytes(one block), total size is HW dependent
|
||||||
|
@ -4213,13 +4208,6 @@ void brcms_c_protection_upd(struct brcms_c_info *wlc, uint idx, int val)
|
||||||
|
|
||||||
static void brcms_c_ht_update_sgi_rx(struct brcms_c_info *wlc, int val)
|
static void brcms_c_ht_update_sgi_rx(struct brcms_c_info *wlc, int val)
|
||||||
{
|
{
|
||||||
wlc->ht_cap.cap_info &= ~(IEEE80211_HT_CAP_SGI_20 |
|
|
||||||
IEEE80211_HT_CAP_SGI_40);
|
|
||||||
wlc->ht_cap.cap_info |= (val & BRCMS_N_SGI_20) ?
|
|
||||||
IEEE80211_HT_CAP_SGI_20 : 0;
|
|
||||||
wlc->ht_cap.cap_info |= (val & BRCMS_N_SGI_40) ?
|
|
||||||
IEEE80211_HT_CAP_SGI_40 : 0;
|
|
||||||
|
|
||||||
if (wlc->pub->up) {
|
if (wlc->pub->up) {
|
||||||
brcms_c_update_beacon(wlc);
|
brcms_c_update_beacon(wlc);
|
||||||
brcms_c_update_probe_resp(wlc, true);
|
brcms_c_update_probe_resp(wlc, true);
|
||||||
|
@ -4230,10 +4218,6 @@ static void brcms_c_ht_update_ldpc(struct brcms_c_info *wlc, s8 val)
|
||||||
{
|
{
|
||||||
wlc->stf->ldpc = val;
|
wlc->stf->ldpc = val;
|
||||||
|
|
||||||
wlc->ht_cap.cap_info &= ~IEEE80211_HT_CAP_LDPC_CODING;
|
|
||||||
if (wlc->stf->ldpc != OFF)
|
|
||||||
wlc->ht_cap.cap_info |= IEEE80211_HT_CAP_LDPC_CODING;
|
|
||||||
|
|
||||||
if (wlc->pub->up) {
|
if (wlc->pub->up) {
|
||||||
brcms_c_update_beacon(wlc);
|
brcms_c_update_beacon(wlc);
|
||||||
brcms_c_update_probe_resp(wlc, true);
|
brcms_c_update_probe_resp(wlc, true);
|
||||||
|
@ -5376,8 +5360,6 @@ brcms_c_attach(struct brcms_info *wl, u16 vendor, u16 device, uint unit,
|
||||||
wlc->bsscfg->wlc = wlc;
|
wlc->bsscfg->wlc = wlc;
|
||||||
|
|
||||||
wlc->mimoft = FT_HT;
|
wlc->mimoft = FT_HT;
|
||||||
wlc->ht_cap.cap_info = HT_CAP;
|
|
||||||
|
|
||||||
wlc->mimo_40txbw = AUTO;
|
wlc->mimo_40txbw = AUTO;
|
||||||
wlc->ofdm_40txbw = AUTO;
|
wlc->ofdm_40txbw = AUTO;
|
||||||
wlc->cck_40txbw = AUTO;
|
wlc->cck_40txbw = AUTO;
|
||||||
|
@ -5403,15 +5385,10 @@ brcms_c_attach(struct brcms_info *wl, u16 vendor, u16 device, uint unit,
|
||||||
if (n_disabled & WLFEATURE_DISABLE_11N_STBC_TX) {
|
if (n_disabled & WLFEATURE_DISABLE_11N_STBC_TX) {
|
||||||
wlc->bandstate[BAND_2G_INDEX]->band_stf_stbc_tx = OFF;
|
wlc->bandstate[BAND_2G_INDEX]->band_stf_stbc_tx = OFF;
|
||||||
wlc->bandstate[BAND_5G_INDEX]->band_stf_stbc_tx = OFF;
|
wlc->bandstate[BAND_5G_INDEX]->band_stf_stbc_tx = OFF;
|
||||||
wlc->ht_cap.cap_info &= ~IEEE80211_HT_CAP_TX_STBC;
|
|
||||||
}
|
}
|
||||||
if (n_disabled & WLFEATURE_DISABLE_11N_STBC_RX)
|
if (n_disabled & WLFEATURE_DISABLE_11N_STBC_RX)
|
||||||
brcms_c_stf_stbc_rx_set(wlc, HT_CAP_RX_STBC_NO);
|
brcms_c_stf_stbc_rx_set(wlc, HT_CAP_RX_STBC_NO);
|
||||||
|
|
||||||
/* apply the GF override from nvram conf */
|
|
||||||
if (n_disabled & WLFEATURE_DISABLE_11N_GF)
|
|
||||||
wlc->ht_cap.cap_info &= ~IEEE80211_HT_CAP_GRN_FLD;
|
|
||||||
|
|
||||||
/* initialize radio_mpc_disable according to wlc->mpc */
|
/* initialize radio_mpc_disable according to wlc->mpc */
|
||||||
brcms_c_radio_mpc_upd(wlc);
|
brcms_c_radio_mpc_upd(wlc);
|
||||||
brcms_b_antsel_set(wlc->hw, wlc->asi->antsel_avail);
|
brcms_b_antsel_set(wlc->hw, wlc->asi->antsel_avail);
|
||||||
|
|
|
@ -456,7 +456,6 @@ struct brcms_txq_info {
|
||||||
* cck_40txbw: 11N, cck tx b/w override when in 40MHZ mode.
|
* cck_40txbw: 11N, cck tx b/w override when in 40MHZ mode.
|
||||||
* ofdm_40txbw: 11N, ofdm tx b/w override when in 40MHZ mode.
|
* ofdm_40txbw: 11N, ofdm tx b/w override when in 40MHZ mode.
|
||||||
* mimo_40txbw: 11N, mimo tx b/w override when in 40MHZ mode.
|
* mimo_40txbw: 11N, mimo tx b/w override when in 40MHZ mode.
|
||||||
* ht_cap: HT CAP IE being advertised by this node.
|
|
||||||
* default_bss: configured BSS parameters.
|
* default_bss: configured BSS parameters.
|
||||||
* mc_fid_counter: BC/MC FIFO frame ID counter.
|
* mc_fid_counter: BC/MC FIFO frame ID counter.
|
||||||
* country_default: saved country for leaving 802.11d auto-country mode.
|
* country_default: saved country for leaving 802.11d auto-country mode.
|
||||||
|
@ -570,7 +569,6 @@ struct brcms_c_info {
|
||||||
s8 cck_40txbw;
|
s8 cck_40txbw;
|
||||||
s8 ofdm_40txbw;
|
s8 ofdm_40txbw;
|
||||||
s8 mimo_40txbw;
|
s8 mimo_40txbw;
|
||||||
struct ieee80211_ht_cap ht_cap;
|
|
||||||
|
|
||||||
struct brcms_bss_info *default_bss;
|
struct brcms_bss_info *default_bss;
|
||||||
|
|
||||||
|
|
|
@ -53,9 +53,6 @@ static void brcms_c_stf_stbc_rx_ht_update(struct brcms_c_info *wlc, int val)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
wlc->ht_cap.cap_info &= ~IEEE80211_HT_CAP_RX_STBC;
|
|
||||||
wlc->ht_cap.cap_info |= (val << IEEE80211_HT_CAP_RX_STBC_SHIFT);
|
|
||||||
|
|
||||||
if (wlc->pub->up) {
|
if (wlc->pub->up) {
|
||||||
brcms_c_update_beacon(wlc);
|
brcms_c_update_beacon(wlc);
|
||||||
brcms_c_update_probe_resp(wlc, true);
|
brcms_c_update_probe_resp(wlc, true);
|
||||||
|
@ -140,12 +137,6 @@ static bool brcms_c_stf_stbc_tx_set(struct brcms_c_info *wlc, s32 int_val)
|
||||||
if ((int_val == ON) && (wlc->stf->txstreams == 1))
|
if ((int_val == ON) && (wlc->stf->txstreams == 1))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if ((int_val == OFF) || (wlc->stf->txstreams == 1)
|
|
||||||
|| !BRCMS_STBC_CAP_PHY(wlc))
|
|
||||||
wlc->ht_cap.cap_info &= ~IEEE80211_HT_CAP_TX_STBC;
|
|
||||||
else
|
|
||||||
wlc->ht_cap.cap_info |= IEEE80211_HT_CAP_TX_STBC;
|
|
||||||
|
|
||||||
wlc->bandstate[BAND_2G_INDEX]->band_stf_stbc_tx = (s8) int_val;
|
wlc->bandstate[BAND_2G_INDEX]->band_stf_stbc_tx = (s8) int_val;
|
||||||
wlc->bandstate[BAND_5G_INDEX]->band_stf_stbc_tx = (s8) int_val;
|
wlc->bandstate[BAND_5G_INDEX]->band_stf_stbc_tx = (s8) int_val;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue