diff options
| author |   Johannes Berg <johannes@sipsolutions.net> | 2008-09-11 02:22:58 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2008-09-15 16:48:24 -0400 |
| commit | b7e35008815a1c39123f4dd53b430788e2e18da4 (patch) | |
| tree | a071c5d2c1224eed68a3684b6367155b1eccfebf /net/mac80211 | |
| parent | mac80211: small rate control changes (diff) | |
| download | linux-dev-b7e35008815a1c39123f4dd53b430788e2e18da4.tar.xz linux-dev-b7e35008815a1c39123f4dd53b430788e2e18da4.zip | |
mac80211: move last_txrate_idx into RC algorithms
This variable in sta_info is only used in a meaningful way
by the Intel RC algorithms, so move it into those.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/rc80211_pid_algo.c | 2 | ||||
| -rw-r--r-- | net/mac80211/sta_info.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/net/mac80211/rc80211_pid_algo.c b/net/mac80211/rc80211_pid_algo.c index 94867860c3e0..24e44f521302 100644 --- a/net/mac80211/rc80211_pid_algo.c +++ b/net/mac80211/rc80211_pid_algo.c @@ -329,8 +329,6 @@ static void rate_control_pid_get_rate(void *priv, struct net_device *dev, if (rateidx >= sband->n_bitrates) rateidx = sband->n_bitrates - 1; - sta->last_txrate_idx = rateidx; - rcu_read_unlock(); sel->rate_idx = rateidx; diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index 4a9b96eeb687..df42d1815458 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h @@ -200,7 +200,6 @@ struct sta_ampdu_mlme { * @tx_bytes: TBD * @tx_fragments: number of transmitted MPDUs * @txrate_idx: TBD - * @last_txrate_idx: TBD * @tid_seq: TBD * @wme_tx_queue: TBD * @ampdu_mlme: TBD @@ -278,7 +277,6 @@ struct sta_info { unsigned long tx_bytes; unsigned long tx_fragments; int txrate_idx; - int last_txrate_idx; u16 tid_seq[IEEE80211_QOS_CTL_TID_MASK + 1]; #ifdef CONFIG_MAC80211_DEBUG_COUNTERS unsigned int wme_tx_queue[NUM_RX_DATA_QUEUES]; |