From patchwork Wed Apr 1 11:03:47 2020 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: 221503 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A683C2D0E7 for ; Wed, 1 Apr 2020 11:07:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 57E8420857 for ; Wed, 1 Apr 2020 11:07:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="HKlUuyyB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732738AbgDALHf (ORCPT ); Wed, 1 Apr 2020 07:07:35 -0400 Received: from mail-eopbgr750070.outbound.protection.outlook.com ([40.107.75.70]:46082 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1732355AbgDALFE (ORCPT ); Wed, 1 Apr 2020 07:05:04 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OVZ2WkU3+oZ/Etyshh7qNrv6oMtMf+E83o6ZJA6sQC0zO4b9bnffQnrQilLN6FlEEUYh7+5FTJNdUe7CGpALDWbITv735Fq9CBE9qpPUFqcHKTw690x9l3cCPhr6EKsrEOTdFMcB7qJ2zlu8RHvIbmxE7NRFuxM4iLkILpZcpVsXTbB9jV3lZBD5ueD2fPR7n+bEIFCmereCYs3cfoOElWG+WU/MSklE6Q+4dA+o7zZapyIjojxkm/VwIQCzgoD2HveR/Z22qxC7PrpgrYAnf9f4dZl2V6bvQYO815tYYy/I2Kn8o9/r42054o7ZANSkDgHJjueNqVKivi/OB2FhTg== 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=pbnuxLmWt0iP2LUq7bC8yC8POuBwjQxzXFwbeIfTZ7g=; b=VdyPbXIPoIyWKCDqulbzn+ilaFfNG5vVBnjY/hq9kg4+TaokLq/cP3nd+yiGc2TUDihBUC8Pc9QzENtDfbOdQgR7HHwEaJLHJPzwRzkS7uL0GI+Di0TTIVQANETTggAEI401sBpDmhZG3rPJhITfv62qBvGAshJ1IK7zfqme8i21XSgWtLq6M1SKJqAMHMlUslR8+80ILOewwpqE1BOl81Wev1vcT079mB+WHK4bLfsN+LuD+TZI8blHb0Mtq/pu6kPuXcepQkEYDDXnd7VcoNIiuldd/49LB8SKtLVE5tUApDdtuJtDaky1icTVQm1Sui0Lbr1b22JHMnJAXmLsAQ== 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=pbnuxLmWt0iP2LUq7bC8yC8POuBwjQxzXFwbeIfTZ7g=; b=HKlUuyyBsEAnZXoQ2GaA8RECA3p+QDHlPwQTW2xhNEp83mABmdOj3MqqIhpqcO1ywS9l6OVpeYin14VprWjJGZKBtqcunuCEzdcBVtWf6OElg1htkoDO8dUxy4ryp1lcrxrvVPyyPTR+i688A+KBeulFv1+xBoSb93sjYR8nQ34= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; Received: from MN2PR11MB4063.namprd11.prod.outlook.com (2603:10b6:208:13f::22) by MN2PR11MB4285.namprd11.prod.outlook.com (2603:10b6:208:191::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2856.20; Wed, 1 Apr 2020 11:04:48 +0000 Received: from MN2PR11MB4063.namprd11.prod.outlook.com ([fe80::ade4:5702:1c8b:a2b3]) by MN2PR11MB4063.namprd11.prod.outlook.com ([fe80::ade4:5702:1c8b:a2b3%7]) with mapi id 15.20.2856.019; Wed, 1 Apr 2020 11:04:48 +0000 From: Jerome Pouiller 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?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 14/32] staging: wfx: do not use link_map_cache to track CAB Date: Wed, 1 Apr 2020 13:03:47 +0200 Message-Id: <20200401110405.80282-15-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200401110405.80282-1-Jerome.Pouiller@silabs.com> References: <20200401110405.80282-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: SN4PR0501CA0156.namprd05.prod.outlook.com (2603:10b6:803:2c::34) To MN2PR11MB4063.namprd11.prod.outlook.com (2603:10b6:208:13f::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.silabs.com (2a01:e35:2435:66a0:1265:30ff:fefd:6e7f) by SN4PR0501CA0156.namprd05.prod.outlook.com (2603:10b6:803:2c::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2878.9 via Frontend Transport; Wed, 1 Apr 2020 11:04:46 +0000 X-Mailer: git-send-email 2.25.1 X-Originating-IP: [2a01:e35:2435:66a0:1265:30ff:fefd:6e7f] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0341eeeb-cb58-4f04-3813-08d7d62c7e31 X-MS-TrafficTypeDiagnostic: MN2PR11MB4285: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-Forefront-PRVS: 03607C04F0 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR11MB4063.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(10009020)(136003)(366004)(346002)(376002)(39850400004)(396003)(7696005)(8676002)(1076003)(16526019)(186003)(5660300002)(86362001)(4326008)(66574012)(52116002)(478600001)(66946007)(66476007)(54906003)(36756003)(8936002)(316002)(81156014)(6486002)(2906002)(66556008)(107886003)(81166006)(2616005); DIR:OUT; SFP:1101; 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: 78+wAF+ciFFoFdDotlwHqDguclQmPp09Y+nyOV8kFVaS5kjEthyK8rGS2XaprJvMT5bNqXUogzKyh1yGe64AOi0BifUPHwuBMLxdL+Rn7vymXen+CSbw98GtnWXVrEc9mqq7EOrfdQRZbN4vUwJ9QIAei19AUKB88Rl3OpehUyDAjVA+8+kBzttPU973vtjnwFWsBASfxY7su5pOPhwa5dHI/Z3F57hIy9pzrtTpdm+uT8u6gUm32Gh+fD1fmjIxKPgd5N9hhlLZLb6i6m4Cwx2gyyY7Nwjl4Wx0uzEsaW2baKi66It5xk4giFH2q+/WN+VyJkOkqXfuXcwfcNl2E0sp9eDbGClI41RC/Dl6n1HuZ8iPjBVpeeFflRpGQ/2suG1J9OHQO0sCi5oms79Cj+cduL0rudKshH369anhGFpakNyOzt7YNWLZSYbCaIB2 X-MS-Exchange-AntiSpam-MessageData: IMmLxwnemGja3xtPGfqg3og1MDGS73uZzdUqdE9YL8DTsqHSsR289wvbOSgj3Z5pKJf9PgZ795ePPNpMU9ONgmEZbol+8BLK6g0Fjg9WsATY5pKm331fMjX4R8tN3+2Yaq1jVlduILvHkv5DEBLw9hzU/zC5PaY4MWS7AiYov3iO6NsAtddF7AlpEA1vt2HQJUdnh+S6evYZsz6QdyPMKA== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0341eeeb-cb58-4f04-3813-08d7d62c7e31 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2020 11:04:48.3202 (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: 2hpk/YpQ2Nxe+lw29/IayF67oEQjjcJAFEmaW7x7iLADta44LSANfMedxqWi+ug0phvoGl2wR9Jqm9gHAAql0w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4285 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller Since we do not track power save status of the stations anymore, link_map_cache is now only used to track "Content After (DTIM) Beacon". We prefer to rely on flags from tx_info. So we will be able to drop link_map_cache. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/queue.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/staging/wfx/queue.c b/drivers/staging/wfx/queue.c index cecf9aa7b3ca..6fa8f4e083d3 100644 --- a/drivers/staging/wfx/queue.c +++ b/drivers/staging/wfx/queue.c @@ -146,13 +146,16 @@ void wfx_tx_queues_deinit(struct wfx_dev *wdev) int wfx_tx_queue_get_num_queued(struct wfx_queue *queue) { - int ret, i; + struct ieee80211_tx_info *tx_info; + struct sk_buff *skb; + int ret = 0; - ret = 0; spin_lock_bh(&queue->queue.lock); - for (i = 0; i < ARRAY_SIZE(queue->link_map_cache); i++) - if (i != WFX_LINK_ID_AFTER_DTIM) - ret += queue->link_map_cache[i]; + skb_queue_walk(&queue->queue, skb) { + tx_info = IEEE80211_SKB_CB(skb); + if (!(tx_info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM)) + ret++; + } spin_unlock_bh(&queue->queue.lock); return ret; }