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

iwlwifi: Fix 3945 rate scaling

Browse Source 
This patch fix 3945 rate scaling after cfg80211 rate/band changes

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Tomas Winkler 2008-03-06 17:36:54 -08:00 committed by John W. Linville
parent c54b679ddc
commit 28447f3cfd
2 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/net/wireless/iwlwifi/iwl-3945-rs.c
View File

@ -158,9 +158,9 @@ static void iwl3945_clear_window(struct iwl3945_rate_scale_data *window)
{ {
window->data = 0; window->data = 0;
window->success_counter = 0; window->success_counter = 0;
window->success_ratio = IWL_INVALID_VALUE; window->success_ratio = -1;
window->counter = 0; window->counter = 0;
window->average_tpt = IWL_INVALID_VALUE; window->average_tpt = IWL_INV_TPT;
window->stamp = 0; window->stamp = 0;
} }
@ -459,13 +459,13 @@ static void rs_tx_status(void *priv_rate,
struct iwl3945_rs_sta *rs_sta; struct iwl3945_rs_sta *rs_sta;
struct ieee80211_supported_band *sband; struct ieee80211_supported_band *sband;
sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
IWL_DEBUG_RATE("enter\n"); IWL_DEBUG_RATE("enter\n");
sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
retries = tx_resp->retry_count; retries = tx_resp->retry_count;
/* FIXME : this is wrong */ first_index = tx_resp->control.tx_rate->hw_value;
first_index = &sband->bitrates[0] - tx_resp->control.tx_rate;
if ((first_index < 0) || (first_index >= IWL_RATE_COUNT)) { if ((first_index < 0) || (first_index >= IWL_RATE_COUNT)) {
IWL_DEBUG_RATE("leave: Rate out of bounds: %d\n", first_index); IWL_DEBUG_RATE("leave: Rate out of bounds: %d\n", first_index);
return; return;
@ -634,7 +634,7 @@ static u16 iwl3945_get_adjacent_rate(struct iwl3945_rs_sta *rs_sta,
* *
*/ */
static void rs_get_rate(void *priv_rate, struct net_device *dev, static void rs_get_rate(void *priv_rate, struct net_device *dev,
struct ieee80211_supported_band *band, struct ieee80211_supported_band *sband,
struct sk_buff *skb, struct sk_buff *skb,
struct rate_selection *sel) struct rate_selection *sel)
{ {
@ -644,9 +644,9 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
int index; int index;
struct iwl3945_rs_sta *rs_sta; struct iwl3945_rs_sta *rs_sta;
struct iwl3945_rate_scale_data *window = NULL; struct iwl3945_rate_scale_data *window = NULL;
int current_tpt = IWL_INVALID_VALUE; int current_tpt = IWL_INV_TPT;
int low_tpt = IWL_INVALID_VALUE; int low_tpt = IWL_INV_TPT;
int high_tpt = IWL_INVALID_VALUE; int high_tpt = IWL_INV_TPT;
u32 fail_count; u32 fail_count;
s8 scale_action = 0; s8 scale_action = 0;
unsigned long flags; unsigned long flags;
@ -670,15 +670,15 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
is_multicast_ether_addr(hdr->addr1) || is_multicast_ether_addr(hdr->addr1) ||
!sta || !sta->rate_ctrl_priv) { !sta || !sta->rate_ctrl_priv) {
IWL_DEBUG_RATE("leave: No STA priv data to update!\n"); IWL_DEBUG_RATE("leave: No STA priv data to update!\n");
sel->rate = rate_lowest(local, band, sta); sel->rate = rate_lowest(local, sband, sta);
rcu_read_unlock(); rcu_read_unlock();
return; return;
} }
rate_mask = sta->supp_rates[band->band]; rate_mask = sta->supp_rates[sband->band];
index = min(sta->last_txrate_idx & 0xffff, IWL_RATE_COUNT - 1); index = min(sta->last_txrate_idx & 0xffff, IWL_RATE_COUNT - 1);
if (priv->band == IEEE80211_BAND_5GHZ) if (sband->band == IEEE80211_BAND_5GHZ)
rate_mask = rate_mask << IWL_FIRST_OFDM_RATE; rate_mask = rate_mask << IWL_FIRST_OFDM_RATE;
rs_sta = (void *)sta->rate_ctrl_priv; rs_sta = (void *)sta->rate_ctrl_priv;
@ -710,7 +710,7 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
if (((fail_count <= IWL_RATE_MIN_FAILURE_TH) && if (((fail_count <= IWL_RATE_MIN_FAILURE_TH) &&
(window->success_counter < IWL_RATE_MIN_SUCCESS_TH))) { (window->success_counter < IWL_RATE_MIN_SUCCESS_TH))) {
window->average_tpt = IWL_INVALID_VALUE; window->average_tpt = IWL_INV_TPT;
spin_unlock_irqrestore(&rs_sta->lock, flags); spin_unlock_irqrestore(&rs_sta->lock, flags);
IWL_DEBUG_RATE("Invalid average_tpt on rate %d: " IWL_DEBUG_RATE("Invalid average_tpt on rate %d: "
@ -729,7 +729,7 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
current_tpt = window->average_tpt; current_tpt = window->average_tpt;
high_low = iwl3945_get_adjacent_rate(rs_sta, index, rate_mask, high_low = iwl3945_get_adjacent_rate(rs_sta, index, rate_mask,
band->band); sband->band);
low = high_low & 0xff; low = high_low & 0xff;
high = (high_low >> 8) & 0xff; high = (high_low >> 8) & 0xff;
@ -746,19 +746,16 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
if ((window->success_ratio < IWL_RATE_DECREASE_TH) || !current_tpt) { if ((window->success_ratio < IWL_RATE_DECREASE_TH) || !current_tpt) {
IWL_DEBUG_RATE("decrease rate because of low success_ratio\n"); IWL_DEBUG_RATE("decrease rate because of low success_ratio\n");
scale_action = -1; scale_action = -1;
} else if ((low_tpt == IWL_INVALID_VALUE) && } else if ((low_tpt == IWL_INV_TPT) && (high_tpt == IWL_INV_TPT))
(high_tpt == IWL_INVALID_VALUE))
scale_action = 1; scale_action = 1;
else if ((low_tpt != IWL_INVALID_VALUE) && else if ((low_tpt != IWL_INV_TPT) && (high_tpt != IWL_INV_TPT) &&
(high_tpt != IWL_INVALID_VALUE) (low_tpt < current_tpt) && (high_tpt < current_tpt)) {
&& (low_tpt < current_tpt)
&& (high_tpt < current_tpt)) {
IWL_DEBUG_RATE("No action -- low [%d] & high [%d] < " IWL_DEBUG_RATE("No action -- low [%d] & high [%d] < "
"current_tpt [%d]\n", "current_tpt [%d]\n",
low_tpt, high_tpt, current_tpt); low_tpt, high_tpt, current_tpt);
scale_action = 0; scale_action = 0;
} else { } else {
if (high_tpt != IWL_INVALID_VALUE) { if (high_tpt != IWL_INV_TPT) {
if (high_tpt > current_tpt) if (high_tpt > current_tpt)
scale_action = 1; scale_action = 1;
else { else {
@ -766,7 +763,7 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
("decrease rate because of high tpt\n"); ("decrease rate because of high tpt\n");
scale_action = -1; scale_action = -1;
} }
} else if (low_tpt != IWL_INVALID_VALUE) { } else if (low_tpt != IWL_INV_TPT) {
if (low_tpt > current_tpt) { if (low_tpt > current_tpt) {
IWL_DEBUG_RATE IWL_DEBUG_RATE
("decrease rate because of low tpt\n"); ("decrease rate because of low tpt\n");
@ -808,7 +805,7 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
out: out:
sta->last_txrate_idx = index; sta->last_txrate_idx = index;
if (priv->band == IEEE80211_BAND_5GHZ) if (sband->band == IEEE80211_BAND_5GHZ)
sta->txrate_idx = sta->last_txrate_idx - IWL_FIRST_OFDM_RATE; sta->txrate_idx = sta->last_txrate_idx - IWL_FIRST_OFDM_RATE;
else else
sta->txrate_idx = sta->last_txrate_idx; sta->txrate_idx = sta->last_txrate_idx;
@ -817,7 +814,7 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
IWL_DEBUG_RATE("leave: %d\n", index); IWL_DEBUG_RATE("leave: %d\n", index);
sel->rate = &priv->ieee_rates[index]; sel->rate = &sband->bitrates[sta->txrate_idx];
} }
static struct rate_control_ops rs_ops = { static struct rate_control_ops rs_ops = {

2
drivers/net/wireless/iwlwifi/iwl-3945-rs.h
View File

@ -159,7 +159,7 @@ enum {
#define IWL_RATES_MASK ((1 << IWL_RATE_COUNT) - 1) #define IWL_RATES_MASK ((1 << IWL_RATE_COUNT) - 1)
#define IWL_INVALID_VALUE -1 #define IWL_INV_TPT -1
#define IWL_MIN_RSSI_VAL -100 #define IWL_MIN_RSSI_VAL -100
#define IWL_MAX_RSSI_VAL 0 #define IWL_MAX_RSSI_VAL 0