lkml.org 
[lkml]   [2010]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 009/123] mac80211: quit addba_resp_timer if Tx BA session is torn down
    2.6.33-stable review patch.  If anyone has any objections, please let me know.

    -----------------

    From: Zhu Yi <yi.zhu@intel.com>

    commit 3dc1de0bf23816ed557ac8addf680cd5ee57e805 upstream.

    Make addba_resp_timer aware the HT_AGG_STATE_REQ_STOP_BA_MSK mask
    so that when ___ieee80211_stop_tx_ba_session() is issued the timer
    will quit. Otherwise when suspend happens before the timer expired,
    the timer handler will be called immediately after resume and
    messes up driver status.

    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Acked-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    net/mac80211/agg-tx.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/net/mac80211/agg-tx.c
    +++ b/net/mac80211/agg-tx.c
    @@ -179,7 +179,8 @@ static void sta_addba_resp_timer_expired

    /* check if the TID waits for addBA response */
    spin_lock_bh(&sta->lock);
    - if ((*state & (HT_ADDBA_REQUESTED_MSK | HT_ADDBA_RECEIVED_MSK)) !=
    + if ((*state & (HT_ADDBA_REQUESTED_MSK | HT_ADDBA_RECEIVED_MSK |
    + HT_AGG_STATE_REQ_STOP_BA_MSK)) !=
    HT_ADDBA_REQUESTED_MSK) {
    spin_unlock_bh(&sta->lock);
    *state = HT_AGG_STATE_IDLE;



    \
     
     \ /
      Last update: 2010-03-13 02:39    [W:4.418 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site