diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-15 07:40:34 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-15 07:40:34 +0400 |
| commit | fc943b12e48f9341bce48c2fadf094cc721aab93 (patch) | |
| tree | 8c3244d7f5fae4edbfe0a5103789b0bc5c64f478 /net/mac80211/rc80211_pid_algo.c | |
| parent | 72d9794f444734af56ef12833b496326643e2964 (diff) | |
| parent | 4c9adafff7d910f142fe44fae37ed12c6b99f20f (diff) | |
| download | linux-fc943b12e48f9341bce48c2fadf094cc721aab93.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/rc80211_pid_algo.c')
| -rw-r--r-- | net/mac80211/rc80211_pid_algo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/rc80211_pid_algo.c b/net/mac80211/rc80211_pid_algo.c index 742c5b06cffd..a914ba73ccf5 100644 --- a/net/mac80211/rc80211_pid_algo.c +++ b/net/mac80211/rc80211_pid_algo.c @@ -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; |