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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

Browse Source
This commit is contained in:
David S. Miller
2008-07-14 20:40:34 -07:00
parent 72d9794f44 4c9adafff7
commit fc943b12e4
62 changed files with 1471 additions and 1737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net/mac80211/rc80211_pid_algo.c
View File

@@ -259,8 +259,8 @@ static void rate_control_pid_tx_status(void *priv, struct net_device *dev,
/* Don't update the state if we're not controlling the rate. */
sdata = sta->sdata;
if (sdata->bss && sdata->bss->force_unicast_rateidx > -1) {
sta->txrate_idx = sdata->bss->max_ratectrl_rateidx;
if (sdata->force_unicast_rateidx > -1) {
sta->txrate_idx = sdata->max_ratectrl_rateidx;
goto unlock;
}
@@ -337,8 +337,8 @@ static void rate_control_pid_get_rate(void *priv, struct net_device *dev,
/* If a forced rate is in effect, select it. */
sdata = IEEE80211_DEV_TO_SUB_IF(dev);
if (sdata->bss && sdata->bss->force_unicast_rateidx > -1)
sta->txrate_idx = sdata->bss->force_unicast_rateidx;
if (sdata->force_unicast_rateidx > -1)
sta->txrate_idx = sdata->force_unicast_rateidx;
rateidx = sta->txrate_idx;