From patchwork Fri Aug 5 09:46:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helmut Schaa X-Patchwork-Id: 1037742 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p759kYgE023214 for ; Fri, 5 Aug 2011 09:46:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753036Ab1HEJqc (ORCPT ); Fri, 5 Aug 2011 05:46:32 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:37481 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751807Ab1HEJqc (ORCPT ); Fri, 5 Aug 2011 05:46:32 -0400 Received: by fxh19 with SMTP id 19so2649182fxh.19 for ; Fri, 05 Aug 2011 02:46:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=PuDHKh/iwU1B+Ndule5/gNIPvgQM+EgsfAEnb5Ecadk=; b=T+3ViK8vtnqakbc/H2rDYwWwB/0PiYNYwlKWYOSFl7Rel7rNy1Gq2zshHJleM5RU+o xnv90KzZlaMuXD5V0cSTHXHjSIvEiZxrz5KVAnbp0oIIltyOrDd2lkFlzUh/mlvDu3R8 GdWHXVFuXHFKughQb5mRDYZaWND0qySPrshKc= Received: by 10.223.127.215 with SMTP id h23mr2564506fas.126.1312537590948; Fri, 05 Aug 2011 02:46:30 -0700 (PDT) Received: from localhost.localdomain (p5495D1B4.dip.t-dialin.net [84.149.209.180]) by mx.google.com with ESMTPS id j18sm1837306faa.46.2011.08.05.02.46.28 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Aug 2011 02:46:29 -0700 (PDT) From: Helmut Schaa To: John Linville Cc: linux-wireless@vger.kernel.org, Johannes Berg , Kalle Valo , Helmut Schaa Subject: [PATCHv2 2/2] mac80211: Don't use a buf_size=0 in ADDBA requests Date: Fri, 5 Aug 2011 11:46:19 +0200 Message-Id: <1312537579-18950-1-git-send-email-helmut.schaa@googlemail.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1311675508-29005-2-git-send-email-helmut.schaa@googlemail.com> References: <1311675508-29005-2-git-send-email-helmut.schaa@googlemail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 05 Aug 2011 09:46:35 +0000 (UTC) According to 802.11-2007, 7.3.1.14 it is compliant to use a buf_size of 0 in ADDBA requests. But some devices (AVM Fritz Stick N) arn't able to handle that correctly and will reply with an ADDBA reponse with a buf_size of 0 which in turn will disallow BA sessions for these devices. To work around this problem, initialize hw.max_tx_aggregation_subframes to the maximum AMPDU buffer size 0x40. Using 0 as default for the bufsize was introduced in commit 5dd36bc933e8be84f8369ac64505a2938f9ce036 (mac80211: allow advertising correct maximum aggregate size). Signed-off-by: Helmut Schaa Acked-by: Johannes Berg --- net/mac80211/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 866f269..104fdd9 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -608,6 +608,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, local->hw.max_rates = 1; local->hw.max_report_rates = 0; local->hw.max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF; + local->hw.max_tx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF; local->hw.conf.long_frame_max_tx_count = wiphy->retry_long; local->hw.conf.short_frame_max_tx_count = wiphy->retry_short; local->user_power_level = -1;