From patchwork Thu Sep 8 08:58:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helmut Schaa X-Patchwork-Id: 1129252 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 p888wF64004403 for ; Thu, 8 Sep 2011 08:58:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932398Ab1IHI6N (ORCPT ); Thu, 8 Sep 2011 04:58:13 -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 S932368Ab1IHI6M (ORCPT ); Thu, 8 Sep 2011 04:58:12 -0400 Received: by mail-fx0-f46.google.com with SMTP id 19so1276683fxh.19 for ; Thu, 08 Sep 2011 01:58:12 -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=566dCro0LSPiydUTh87G3UqqlF6kuT3DI97lXohf46E=; b=dtZhHEpR1PjUrme88BT+8jOwarT7LgB/+k7FZbV+wJD4wAoAYuwCQHygCB90M+kkcp SOxO3NvVT6FIdvomsZ3dMsjgBYwqlBkFWATdaN+6H2IlNKWVsz9FHp+HwDGvTstNli5g Hyx8Ncl3VhX+FRsU9Ob02KRYqR+YoG7EUKff8= Received: by 10.223.22.14 with SMTP id l14mr762775fab.100.1315472277646; Thu, 08 Sep 2011 01:57:57 -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.56 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 08 Sep 2011 01:57:56 -0700 (PDT) From: Helmut Schaa To: linux-wireless@vger.kernel.org Cc: linville@tuxdriver.com, johannes@sipsolutions.net, nbd@openwrt.org, Helmut Schaa , Ivo Van Doorn , Gertjan van Wingerde Subject: [PATCH 2/2] rt2x00: Remove special case for rate probe frames Date: Thu, 8 Sep 2011 10:58:02 +0200 Message-Id: <1315472282-21051-2-git-send-email-helmut.schaa@googlemail.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1315472282-21051-1-git-send-email-helmut.schaa@googlemail.com> References: <1315472282-21051-1-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 (demeter2.kernel.org [140.211.167.43]); Thu, 08 Sep 2011 08:58:15 +0000 (UTC) This is handled in minstrel_ht now. No need to special case it here again. Signed-off-by: Helmut Schaa Cc: Ivo Van Doorn Cc: Gertjan van Wingerde Acked-by: Ivo van Doorn --- Ivo, I'm sending this directly to John due to the dependency on the minstrel_ht patch. drivers/net/wireless/rt2x00/rt2x00queue.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c index ba0d7e6..033d2cd 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c @@ -330,11 +330,9 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, } /* - * This frame is eligible for an AMPDU, however, don't aggregate - * frames that are intended to probe a specific tx rate. + * This frame is eligible for an AMPDU. */ - if (tx_info->flags & IEEE80211_TX_CTL_AMPDU && - !(tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)) + if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) __set_bit(ENTRY_TXD_HT_AMPDU, &txdesc->flags); /*