From patchwork Tue Dec 17 16:14:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 1211547 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="H3d0rZNl"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47ck0S2d0Bz9sRM for ; Wed, 18 Dec 2019 03:21:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729380AbfLQQVI (ORCPT ); Tue, 17 Dec 2019 11:21:08 -0500 Received: from mail-eopbgr680046.outbound.protection.outlook.com ([40.107.68.46]:59543 "EHLO NAM04-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726858AbfLQQOj (ORCPT ); Tue, 17 Dec 2019 11:14:39 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KmKOJCVzBShRQBz0yNZ2e16t+0Qn6jvOuQMYj0mY8WhlnRJJoqrX2Hvb+TSIQsCuj243n8/GqTZBXXJiSHuPr81k/q8XWTfczakSs4nGFeggzR9Ktja0vYRymZFGxQ+ObBjMR+DXqMETotK1Y0ymGa6UG3XFrqyJOvXlO01itu5GM2zJFo5kz3g1AM/IQZIScc/+XHcQ8DdSg3MInlTDjeIcTXguzNxZAWJkMeh646z7YqU4evc6/LEvwzesLMoIAx2pnI42OffJ/At4V3hQqqWilFfy1tZsAD2E8wNGlJLzPx6Z0B7byxSNtLiDiPTCLEB2Fedn76aoUMICkxp+NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FRLMZCQ+5rhWTrLjUj6s2NJKPZPRMfxJgueobw2UHVc=; b=iiAxNS13NxPKeyny6jwZ+jK7Ga41BQFY6XihGYFbYKOrFKMsfDOZDadV91m6bSUNHObqyEM8uoh1xlKqDoa2UEzpFXngDlgIKy/za4PkSrInnCHG8MW2KqExtpTSfjzqZC8cQoai1+gDeedw4xdpEEsWmHOBNbkWvtlztf99aplAjAhsuErB33TIXy3zsqsUc3NfjhBjnUwRI/DtgH/VApWzbTs0rPZiey0Od9ONJZ5s42x72GJ/UWn9S80hj2ujyuTTyzTgQsVLvG8IgdHDHE92A4TAI6hblyCWT5aAINy40vkcQ9ZAN93wI/sJmWM4MtQlHeCVRKq3qvQWZYYOaA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FRLMZCQ+5rhWTrLjUj6s2NJKPZPRMfxJgueobw2UHVc=; b=H3d0rZNlTV5dQ7BhbPgIsoShWxI/fxcP+b7Q90tHDRHJhjRY043r/IhQgGHlpMhcMSCeKUUbfxv59H99omRaOTACak2PrhTLAy75+DaUzJNZ2JplUSXNWBYE1Pdzzl3jGmgVzuxQ13YNM8OmKTbFM7B/WH3LB43mYyNV6AtK8lc= Received: from MN2PR11MB4063.namprd11.prod.outlook.com (10.255.180.22) by MN2PR11MB3791.namprd11.prod.outlook.com (20.178.254.78) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2538.18; Tue, 17 Dec 2019 16:14:34 +0000 Received: from MN2PR11MB4063.namprd11.prod.outlook.com ([fe80::f46c:e5b4:2a85:f0bf]) by MN2PR11MB4063.namprd11.prod.outlook.com ([fe80::f46c:e5b4:2a85:f0bf%4]) with mapi id 15.20.2538.019; Tue, 17 Dec 2019 16:14:34 +0000 From: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= To: "devel@driverdev.osuosl.org" , "linux-wireless@vger.kernel.org" CC: "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91?= =?utf-8?q?iller?= Subject: [PATCH v2 06/55] staging: wfx: fix rate control handling Thread-Topic: [PATCH v2 06/55] staging: wfx: fix rate control handling Thread-Index: AQHVtPUSV3snjZp3tk+yJwmm+q7V1g== Date: Tue, 17 Dec 2019 16:14:34 +0000 Message-ID: <20191217161318.31402-7-Jerome.Pouiller@silabs.com> References: <20191217161318.31402-1-Jerome.Pouiller@silabs.com> In-Reply-To: <20191217161318.31402-1-Jerome.Pouiller@silabs.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: PR0P264CA0174.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1c::18) To MN2PR11MB4063.namprd11.prod.outlook.com (2603:10b6:208:13f::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.24.0 x-originating-ip: [37.71.187.125] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 12085b06-c95a-4b02-af7f-08d7830c34df x-ms-traffictypediagnostic: MN2PR11MB3791: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7691; x-forefront-prvs: 02543CD7CD x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(346002)(136003)(39860400002)(189003)(199004)(2906002)(52116002)(107886003)(2616005)(86362001)(478600001)(6486002)(4326008)(64756008)(66556008)(66476007)(81156014)(66946007)(6506007)(1076003)(316002)(66446008)(8936002)(71200400001)(81166006)(5660300002)(36756003)(26005)(186003)(8676002)(85202003)(85182001)(110136005)(54906003)(6512007); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR11MB3791; H:MN2PR11MB4063.namprd11.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: silabs.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: QHiAspH8YJXEBnUWd0EaXPuVQPerGCKcdrEUP6Av1R76PzsWw08w27qp9nf/cR8xm04zbEAlGGY3IEUAkR40MqavZRzpi4kqrjGR2sR6JHN1flF37MnK1dPGVN2s5/eSOqi9RA4/RxnqVuPLgxCGwVONTZQ5xY/OBwZAr0qSHny8547YHuVwrVcHTExRP6pMga/lrPQvB6ktON0+IEd7SdO0jdiT/v2zNaf5sEFsKQidZUVn6nOVm2uVEF9FhW4fnpATfVhMKK0VjHZ22plmee9WTdcISisZivmgJK5Ey+8lwkmVUPddtCA78me7xi8dH+asla/d0JEEGtfx+B8k5Ky7O1Du0Jyvkg3WFatQt78kPOFCrAx1bpt0TsRnQeSPQ/q2l8KoS2rf8QQE2HVEjSegy/aJ+yJCqad16lmKIfPTxVEkuHIeffkAQDRVNEPH Content-ID: MIME-Version: 1.0 X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 12085b06-c95a-4b02-af7f-08d7830c34df X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Dec 2019 16:14:34.8324 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: qjPpXTFV4XXqMjbKDX8FnlzYBbWDi/zzfkBeoqb1pEbFECFVU1sxdcoxJBNHJnNOpa3tJlqYvVpyYacOdiE8Og== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB3791 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller A tx_retry_policy (the equivalent of a list of ieee80211_tx_rate in hardware API) is not able to include a rate multiple time. So currently, the driver merges the identical rates from the policy provided by minstrel (and it try to do the best choice it can in the associated flags) before to sent it to firmware. Until now, when rates are merged, field "count" is set to max(count1, count2). But, it means that the sum of retries for all rates could be far less than initial number of retries. So, this patch changes the value of field "count" to count1 + count2. Thus, sum of all retries for all rates stay the same. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/data_tx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/wfx/data_tx.c b/drivers/staging/wfx/data_tx.c index b726dd5e59f3..46ad83b95f52 100644 --- a/drivers/staging/wfx/data_tx.c +++ b/drivers/staging/wfx/data_tx.c @@ -524,9 +524,9 @@ static void wfx_tx_fixup_rates(struct ieee80211_tx_rate *rates) for (i = 0; i < IEEE80211_TX_MAX_RATES - 1; i++) { if (rates[i + 1].idx == rates[i].idx && rates[i].idx != -1) { - rates[i].count = - max_t(int, rates[i].count, - rates[i + 1].count); + rates[i].count += rates[i + 1].count; + if (rates[i].count > 15) + rates[i].count = 15; rates[i + 1].idx = -1; rates[i + 1].count = 0;