leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: vt6656: set all cck rates to default.

Browse Source 
mac80211 rate control decides which cck rates to use so all of
them should be set enabled at the appropriate bit rate.

This means vnt_get_cck_rate is no longer required.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Link: https://lore.kernel.org/r/dec847da-5bad-1920-f275-741f7f704fb3@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2020-04-02 22:42:17 +01:00 committed by Greg Kroah-Hartman
parent 1b3409b574
commit 55126bb37d
1 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/staging/vt6656/card.c
View File

@ -74,32 +74,6 @@ void vnt_set_channel(struct vnt_private *priv, u32 connection_channel)
(u8)(connection_channel | 0x80)); (u8)(connection_channel | 0x80));
} }
/*
* Description: Get CCK mode basic rate
*
* Parameters:
* In:
* priv - The adapter to be set
* rate_idx - Receiving data rate
* Out:
* none
*
* Return Value: response Control frame rate
*
*/
static u16 vnt_get_cck_rate(struct vnt_private *priv, u16 rate_idx)
{
u16 ui = rate_idx;
while (ui > RATE_1M) {
if (priv->basic_rates & (1 << ui))
return ui;
ui--;
}
return RATE_1M;
}
/* /*
* Description: Calculate TxRate and RsvTime fields for RSPINF in OFDM mode. * Description: Calculate TxRate and RsvTime fields for RSPINF in OFDM mode.
* *
@ -216,20 +190,16 @@ void vnt_set_rspinf(struct vnt_private *priv, u8 bb_type)
int i; int i;
/*RSPINF_b_1*/ /*RSPINF_b_1*/
vnt_get_phy_field(priv, 14, vnt_get_cck_rate(priv, RATE_1M), vnt_get_phy_field(priv, 14, RATE_1M, PK_TYPE_11B, &phy[0]);
PK_TYPE_11B, &phy[0]);
/*RSPINF_b_2*/ /*RSPINF_b_2*/
vnt_get_phy_field(priv, 14, vnt_get_cck_rate(priv, RATE_2M), vnt_get_phy_field(priv, 14, RATE_2M, PK_TYPE_11B, &phy[1]);
PK_TYPE_11B, &phy[1]);
/*RSPINF_b_5*/ /*RSPINF_b_5*/
vnt_get_phy_field(priv, 14, vnt_get_cck_rate(priv, RATE_5M), vnt_get_phy_field(priv, 14, RATE_5M, PK_TYPE_11B, &phy[2]);
PK_TYPE_11B, &phy[2]);
/*RSPINF_b_11*/ /*RSPINF_b_11*/
vnt_get_phy_field(priv, 14, vnt_get_cck_rate(priv, RATE_11M), vnt_get_phy_field(priv, 14, RATE_11M, PK_TYPE_11B, &phy[3]);
PK_TYPE_11B, &phy[3]);
/*RSPINF_a_6*/ /*RSPINF_a_6*/
vnt_calculate_ofdm_rate(RATE_6M, bb_type, &tx_rate[0], &rsv_time[0]); vnt_calculate_ofdm_rate(RATE_6M, bb_type, &tx_rate[0], &rsv_time[0]);