From patchwork Thu Sep 8 08:58:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helmut Schaa X-Patchwork-Id: 1129242 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p888w1nD003445 for ; Thu, 8 Sep 2011 08:58:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932369Ab1IHI56 (ORCPT ); Thu, 8 Sep 2011 04:57:58 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:51783 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932368Ab1IHI55 (ORCPT ); Thu, 8 Sep 2011 04:57:57 -0400 Received: by fxh19 with SMTP id 19so1276683fxh.19 for ; Thu, 08 Sep 2011 01:57:56 -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; bh=YoNN20b6qTbp8pfh0ESA1w1kkFtF2POqUM9oiYkMCG0=; b=pqqNi5gYlBaYabDP+Yf+pqw2WHNGSxvMtvLHIz5Hzxfw9wnTEJvPCHZUTQu/OXWo2L 4E/EZ0/+GJy04lg2MQDntb1xsTsIevPyPp28+oRpPkmKPxljPv6mgXhQ2H3llswimVp4 +KOsAre01IDtAJ8UTqYWpBQI4hDcd22OGv3ns= Received: by 10.223.54.134 with SMTP id q6mr745911fag.130.1315472276279; Thu, 08 Sep 2011 01:57:56 -0700 (PDT) Received: from localhost.localdomain (port-92-198-130-130.static.qsc.de [92.198.130.130]) by mx.google.com with ESMTPS id d25sm1063840fak.7.2011.09.08.01.57.55 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 08 Sep 2011 01:57:55 -0700 (PDT) From: Helmut Schaa To: linux-wireless@vger.kernel.org Cc: linville@tuxdriver.com, johannes@sipsolutions.net, nbd@openwrt.org, Helmut Schaa Subject: [PATCH 1/2] mac80211: Don't aggregate rate probe frames in minstrel_ht Date: Thu, 8 Sep 2011 10:58:01 +0200 Message-Id: <1315472282-21051-1-git-send-email-helmut.schaa@googlemail.com> X-Mailer: git-send-email 1.7.3.4 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 (demeter2.kernel.org [140.211.167.43]); Thu, 08 Sep 2011 08:58:01 +0000 (UTC) This is already done by rt2x00 and ath9k by checking the IEEE80211_TX_CTL_RATE_CTRL_PROBE flag. Instead we can simply do it in minstrel_ht. Signed-off-by: Helmut Schaa --- Felix, I didn't have a closer look at the ath9k aggregation code but I guess it can also be simplified with this change. Any objections? Thanks, Helmut net/mac80211/rc80211_minstrel_ht.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index 2158838..6a7bbe0 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -627,6 +627,8 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta, minstrel_ht_set_rate(mp, mi, &ar[0], sample_idx, txrc, true, false); info->flags |= IEEE80211_TX_CTL_RATE_CTRL_PROBE; + /* don't aggregate probe frames */ + info->flags &= ~IEEE80211_TX_CTL_AMPDU; } else { minstrel_ht_set_rate(mp, mi, &ar[0], mi->max_tp_rate, txrc, false, false);