From patchwork Wed Nov 20 18:13:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Beldan X-Patchwork-Id: 3214651 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B17E3C045B for ; Wed, 20 Nov 2013 18:14:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E411720778 for ; Wed, 20 Nov 2013 18:14:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DD9DC2076A for ; Wed, 20 Nov 2013 18:14:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753729Ab3KTSOa (ORCPT ); Wed, 20 Nov 2013 13:14:30 -0500 Received: from mail-wg0-f44.google.com ([74.125.82.44]:64667 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751940Ab3KTSOa (ORCPT ); Wed, 20 Nov 2013 13:14:30 -0500 Received: by mail-wg0-f44.google.com with SMTP id k14so9312637wgh.11 for ; Wed, 20 Nov 2013 10:14:29 -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; bh=1V9R7Bvx+oZDq+oo0qPQdQlokVKPOtQBQLWCAXEadoY=; b=avYb+QaDNSnGqXykHTLvs7DdoaDAI2/au4cSpDzMrdg6+H53LWQ4VRHtG2sKQoXtJD 1/kI10SCgm6QthDk+A1PGllpXuBgmQWrKOjdYMLjhOAE6TSWuhA7YyyFxuRGrRxeQKxz Bffw7NrBSdWMGUZwV/zSqx4mukOutxu2jcOQu2M7cbjU2a5dnj0TqMeMlRUSVB/MTIkr +fWeNL+7ZUNJwKM7lPtcEzWAQI4FF3GPzS3aczK7HHY5C3KPBpnjiMfqeyKdJk1i0LTf Neip9cmKmkyw5Rh4cJlFqsDAWM6RYgFelZOwF1soQoH0cEfAnX02ulrKPGK/vwQNul4f be/g== X-Received: by 10.194.235.138 with SMTP id um10mr1992956wjc.30.1384971268990; Wed, 20 Nov 2013 10:14:28 -0800 (PST) Received: from magnum.frso.rivierawaves.com (vpn.rivierawaves.com. [91.151.119.162]) by mx.google.com with ESMTPSA id dz5sm18540179wib.7.2013.11.20.10.14.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Nov 2013 10:14:28 -0800 (PST) From: Karl Beldan To: Johannes Berg Cc: linux-wireless , Karl Beldan , Felix Fietkau Subject: [PATCH v2] mac80211: use capped prob when computing throughputs Date: Wed, 20 Nov 2013 19:13:35 +0100 Message-Id: <1384971215-16302-1-git-send-email-karl.beldan@gmail.com> X-Mailer: git-send-email 1.8.2 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.3 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 Commit 3e8b1eb "mac80211/minstrel_ht: improve rate selection stability" introduced a local capped prob in minstrel_ht_calc_tp but omitted to use it to compute the per rate throughput. Signed-off-by: Karl Beldan Cc: Felix Fietkau --- net/mac80211/rc80211_minstrel_ht.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index 9702d88..7817a23 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -333,7 +333,7 @@ minstrel_ht_calc_tp(struct minstrel_ht_sta *mi, int group, int rate) nsecs = 1000 * mi->overhead / MINSTREL_TRUNC(mi->avg_ampdu_len); nsecs += minstrel_mcs_groups[group].duration[rate]; - tp = 1000000 * ((mr->probability * 1000) / nsecs); + tp = 1000000 * ((prob * 1000) / nsecs); mr->cur_tp = MINSTREL_TRUNC(tp); }