From patchwork Fri Nov 8 16:34:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Beldan X-Patchwork-Id: 3159041 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C2BC99F326 for ; Fri, 8 Nov 2013 16:35:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2A7C420445 for ; Fri, 8 Nov 2013 16:35:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EC14720383 for ; Fri, 8 Nov 2013 16:35:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757599Ab3KHQfA (ORCPT ); Fri, 8 Nov 2013 11:35:00 -0500 Received: from mail-we0-f177.google.com ([74.125.82.177]:37518 "EHLO mail-we0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757515Ab3KHQe6 (ORCPT ); Fri, 8 Nov 2013 11:34:58 -0500 Received: by mail-we0-f177.google.com with SMTP id x55so2142211wes.8 for ; Fri, 08 Nov 2013 08:34:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Tky24+qDalEIyaslcA2D1528N2aoyzsHDXjRl11nPcI=; b=p1FGXSMOd1M3W62y7fdFkyXTBYBHuso1viRBM5OzUlHIy+1/YoJPNELyS1Dg5oYNXS ICVy8cljdvyEbPXCQBomUs52GM86vK5UdNx6/6AtE3rUyYMDCw35/Q3DMu6btXLYjMfW kLk0FWkAlEYNDXNdIpykMQ6HJbT1o9afAhS0FhnMNRsEPQAHWk1DDrWxZnh4zQkP8ewM p3Xzz2GUJsydlNOra0f3CJp63pakgh08805M5Hxwjd1vsZcPYcMn2h9V3gW8YIvrL/Qu 4OZcgeeH3HlVUYAxbayofoYhLoLWEXYPWijjodRu2IYbfOmmkD0hp0F8f8WhuZ18+p/6 Yb6w== X-Received: by 10.181.12.104 with SMTP id ep8mr3065299wid.54.1383928497466; Fri, 08 Nov 2013 08:34:57 -0800 (PST) Received: from magnum.frso.rivierawaves.com (vpn.rivierawaves.com. [91.151.119.162]) by mx.google.com with ESMTPSA id y20sm7032703wib.0.2013.11.08.08.34.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Nov 2013 08:34:57 -0800 (PST) From: Karl Beldan To: Johannes Berg Cc: Felix Fietkau , linux-wireless , Karl Beldan Subject: [PATCH 2/2] mac80211: minstrel_ht: do not sample unsupported rates Date: Fri, 8 Nov 2013 17:34:33 +0100 Message-Id: <1383928473-798-2-git-send-email-karl.beldan@gmail.com> X-Mailer: git-send-email 1.8.2 In-Reply-To: <1383928473-798-1-git-send-email-karl.beldan@gmail.com> References: <1383928473-798-1-git-send-email-karl.beldan@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Karl Beldan ATM minstrel_ht does not check whether the sampling rate is supported. Unsupported rates attempts can trigger when there are holes between supported MCSes belonging to the same group (e.g many devices are capable of MCS32 without being capable of MCS33->MCS39). This change replaces an unsupported sample index with the fls of the bitfield of supported indexes. This is not a problem in minstrel which fills a per STA sample table with only supported rates (though only at init). Signed-off-by: Karl Beldan --- net/mac80211/rc80211_minstrel_ht.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index aeec401..1b835ad 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -703,6 +703,8 @@ minstrel_get_sample_rate(struct minstrel_priv *mp, struct minstrel_ht_sta *mi) mg = &mi->groups[mi->sample_group]; sample_idx = sample_table[mg->column][mg->index]; + if (!(mg->supported & BIT(sample_idx))) + sample_idx = fls(sample_idx) - 1; mr = &mg->rates[sample_idx]; sample_group = mi->sample_group; sample_idx += sample_group * MCS_GROUP_RATES;