staging: vt6656: vnt_update_ifs set max_min based on short slot time.
Short slot time is controlled by mac80211 so there is no need to find odfm rates. Merge PK_TYPE_11B and PK_TYPE_11GA & PK_TYPE_11GB into one else and switch on short slot time. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
bb3fd86988
commit
c3972591d9
|
@ -359,35 +359,18 @@ void vnt_update_ifs(struct vnt_private *priv)
|
|||
priv->sifs = C_SIFS_A;
|
||||
priv->difs = C_SIFS_A + 2 * C_SLOT_SHORT;
|
||||
max_min = 4;
|
||||
} else if (priv->packet_type == PK_TYPE_11B) {
|
||||
priv->slot = C_SLOT_LONG;
|
||||
priv->sifs = C_SIFS_BG;
|
||||
priv->difs = C_SIFS_BG + 2 * C_SLOT_LONG;
|
||||
max_min = 5;
|
||||
} else {/* PK_TYPE_11GA & PK_TYPE_11GB */
|
||||
bool ofdm_rate = false;
|
||||
unsigned int ii = 0;
|
||||
|
||||
} else {
|
||||
priv->sifs = C_SIFS_BG;
|
||||
|
||||
if (priv->short_slot_time)
|
||||
if (priv->short_slot_time) {
|
||||
priv->slot = C_SLOT_SHORT;
|
||||
else
|
||||
max_min = 4;
|
||||
} else {
|
||||
priv->slot = C_SLOT_LONG;
|
||||
|
||||
priv->difs = C_SIFS_BG + 2 * priv->slot;
|
||||
|
||||
for (ii = RATE_54M; ii >= RATE_6M; ii--) {
|
||||
if (priv->basic_rates & ((u32)(0x1 << ii))) {
|
||||
ofdm_rate = true;
|
||||
break;
|
||||
}
|
||||
max_min = 5;
|
||||
}
|
||||
|
||||
if (ofdm_rate)
|
||||
max_min = 4;
|
||||
else
|
||||
max_min = 5;
|
||||
priv->difs = C_SIFS_BG + 2 * priv->slot;
|
||||
}
|
||||
|
||||
priv->eifs = C_EIFS;
|
||||
|
|
Loading…
Reference in New Issue