From 2f366790503e1ab018612339968a9f4770420883 Mon Sep 17 00:00:00 2001 From: Helmut Schaa Date: Tue, 26 Jul 2011 12:18:27 +0200 Subject: [PATCH] --- yaml --- r: 265399 b: refs/heads/master c: 3ca97880ea7af47be479aadfe896cafc54939708 h: refs/heads/master i: 265397: b7f8965cfdc12b0d6fa984a04861aca36c08733b 265395: eabf2dfdf7c107c8592c134d79255617be43c3b0 265391: 3837c8726742bb231f5ba31b07ad74f1e4202208 v: v3 --- [refs] | 2 +- trunk/net/mac80211/agg-tx.c | 18 +++++++----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index c072f62d7163..3e20d3eba2da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 191d6a8cc2d282db3707e9c71f49815ccdc79c54 +refs/heads/master: 3ca97880ea7af47be479aadfe896cafc54939708 diff --git a/trunk/net/mac80211/agg-tx.c b/trunk/net/mac80211/agg-tx.c index c8be8eff70da..b7075f33dc06 100644 --- a/trunk/net/mac80211/agg-tx.c +++ b/trunk/net/mac80211/agg-tx.c @@ -777,18 +777,14 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local, #ifdef CONFIG_MAC80211_HT_DEBUG printk(KERN_DEBUG "switched off addBA timer for tid %d\n", tid); #endif - + /* + * IEEE 802.11-2007 7.3.1.14: + * In an ADDBA Response frame, when the Status Code field + * is set to 0, the Buffer Size subfield is set to a value + * of at least 1. + */ if (le16_to_cpu(mgmt->u.action.u.addba_resp.status) - == WLAN_STATUS_SUCCESS) { - /* - * IEEE 802.11-2007 7.3.1.14: - * In an ADDBA Response frame, when the Status Code field - * is set to 0, the Buffer Size subfield is set to a value - * of at least 1. - */ - if (!buf_size) - goto out; - + == WLAN_STATUS_SUCCESS && buf_size) { if (test_and_set_bit(HT_AGG_STATE_RESPONSE_RECEIVED, &tid_tx->state)) { /* ignore duplicate response */