Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[pandora-kernel.git] / net / mac80211 / rx.c

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index d64e285..7cbb4aa 100644 (file)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -794,8 +794,7 @@ static void ieee80211_rx_reorder_ampdu(struct ieee80211_rx_data *rx)
 
        /* reset session timer */
        if (tid_agg_rx->timeout)
-               mod_timer(&tid_agg_rx->session_timer,
-                         TU_TO_EXP_TIME(tid_agg_rx->timeout));
+               tid_agg_rx->last_rx = jiffies;
 
        /* if this mpdu is fragmented - terminate rx aggregation session */
        sc = le16_to_cpu(hdr->seq_ctrl);
@@ -2270,11 +2269,8 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
 
                        sband = rx->local->hw.wiphy->bands[status->band];
 
-                       rate_control_rate_update(
-                               local, sband, rx->sta,
-                               IEEE80211_RC_SMPS_CHANGED,
-                               ieee80211_get_tx_channel_type(
-                                       local, local->_oper_channel_type));
+                       rate_control_rate_update(local, sband, rx->sta,
+                                                IEEE80211_RC_SMPS_CHANGED);
                        goto handled;
                }
                default: