From patchwork Wed Apr 1 11:03:51 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: 1265127 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.a=rsa-sha256 header.s=selector2-silabs-onmicrosoft-com header.b=p2p5JdUf; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48sjyx63ZSz9sRf for ; Wed, 1 Apr 2020 22:05:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732455AbgDALFM (ORCPT ); Wed, 1 Apr 2020 07:05:12 -0400 Received: from mail-bn7nam10on2089.outbound.protection.outlook.com ([40.107.92.89]:6053 "EHLO NAM10-BN7-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1732335AbgDALFH (ORCPT ); Wed, 1 Apr 2020 07:05:07 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nPs0JlMNyTEXl7aWc2dIADAO5j+ku64zPrw/OGjf4598emz8t8CqL99XNtP460udnszrvcTOCogHUafYDZ7hZ+0cQvleBurou2i9OUD/tFCEBef+z1qWwPEDdxFeyWTFDXuyXn+cx3FHd6RBr3qSk8akgspy83RUzQOckiQERi9tYOcVi/eIbXNcZvY03rwD0L+diia2Zi5oC6XgVKMVOm7vK8V0C8jubLKQadcw4oVsumTZabgI2nmyr0dt4P1dAkBr6GQzEvLMZ3S+azchD563D7XKG3EkIsu5EPNUV+lFlOFRbnrzKgibHK2u0gtCGBnVM6qdnjSrdPJoSfLhMw== 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=20ueHzGkZvyRLZMo7s2ss/kn1LfmbL/UGhtDkK8/TvQ=; b=HRcTo87Cnr+F9vgYkIxtqE+4KcV2Z8hO0Zp5FS3TxT6S0U+JoUGrQqhXiwqAVwRRTWTZruDtT6Yvb+aeJ1ozOtf1HSqu6Z2tUTckH52FLxbT5E3vDeMgf0dXdIraNSUBvOslGPJfR+4EA5dQXu0J8BxKZ6qg3WaabkIQsmvFBn55WSWD9wnKOYExJu6DlQd0xbZkjB/8W9i8WhWuewgm5rdX0aF68YG0I8MDA/gEx2lfV81XUfzl0FMpV8nttX/QD7xaSC2Mk/HooCzbSHubuSOiZJ88YsLXu5noIoFoeHvERd8VOx+vwYPudkUHS+wNk6kQqtPzfEvrslGlGaZomQ== 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=20ueHzGkZvyRLZMo7s2ss/kn1LfmbL/UGhtDkK8/TvQ=; b=p2p5JdUfDfUGdwYq0grxAKvm5ZsgDq/c+5of2XOA7599NYb/dsmkS/TU4Vi+NmxSlKNeUQjxCxDVtEo68LdPFwt73Y83SsfGVDxG+stVHs4vmErKrJ9472rnlIyHprluvXMVCt5y4QRUvjwHd0GcBbQSj7bQ+qQW21gfdC4QDLw= 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:56 +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:56 +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 18/32] staging: wfx: drop unused raw_link_id field Date: Wed, 1 Apr 2020 13:03:51 +0200 Message-Id: <20200401110405.80282-19-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:54 +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: f7147423-a4a7-4bed-1c56-08d7d62c8347 X-MS-TrafficTypeDiagnostic: MN2PR11MB4285: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2803; 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)(6666004)(5660300002)(86362001)(4326008)(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: HLFZCAJmo7AMq7kyy+j/9qaPsslT8EJzH9x6BEJ40HFquNoWJmqQ4Sch7/rhM9O6eT7icnEE4OWfftK2qTTYay9yhiFrklSgdx0P7RXN2OaKNvJrB8QHZvrj87x1BHIGRXeKjjuVXop4zZ5eVQJvsgkxTb3ghe8oZxQcKqsqnZzAP7DjLW3vzUy+S3GwV7oSaAeaIba/VhMjbJJ6IQa2EXJ9vwYVspm/Pi1EEcvQVrQnKiuQ/q1oADMOY+8aTTwZDUeZxhpDQhFdab7qlDll1gcuNpZIToiLJroiy8bvZpxVixRPpJvU1zAFnLOgxfpjK97/1ZvIgFocxC/8cAvvUGgbtxTnYaYvRByF0BWBUq3UXdkdC1WEy1DZRzUx8PP+axZy+gCO4RWRlhCc3bl4DGAFMVpokMMpg+cg8WIG15McjhgywDZBuoZQ3q5rHvgx X-MS-Exchange-AntiSpam-MessageData: ZHZCdHbdu3Fmb7cjJY5uhPuhtvU0YIm8b5VFUwE6yPuY5VXarFHOvG7Ly2rDC2DZRHOtXTBnwsXiNXc0Qe8n0ngD1nlLMhM8YQPFuI6X1wFdA1E8HVy42QBwZlNcU5BdjLp2RjFYK+eA1G9aQujS1R5pBF6EIFLIBl9G4mNh4qN7RLRTkzN2agwlXD0fiAwxT/9eKbcukfU8vJigrxn0KQ== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: f7147423-a4a7-4bed-1c56-08d7d62c8347 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2020 11:04:56.7284 (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: 71W5l25Oz1CGYIRvo5VkX7TthRKuEem/pgb5FvoyTkau6RRplqoab9bPn01Nh+INIQECJiJDYMhaoLM79wVNEw== 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 raw_link_id can be retrieved by wfx_tx_get_raw_link_id(). So, it is not necessary to keep it in struct wfx_tx_priv. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/data_tx.c | 3 +-- drivers/staging/wfx/data_tx.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/wfx/data_tx.c b/drivers/staging/wfx/data_tx.c index f794212f42e2..57afabc102a7 100644 --- a/drivers/staging/wfx/data_tx.c +++ b/drivers/staging/wfx/data_tx.c @@ -423,7 +423,6 @@ static int wfx_tx_inner(struct wfx_vif *wvif, struct ieee80211_sta *sta, memset(tx_info->rate_driver_data, 0, sizeof(struct wfx_tx_priv)); // Fill tx_priv tx_priv = (struct wfx_tx_priv *)tx_info->rate_driver_data; - tx_priv->raw_link_id = wfx_tx_get_raw_link_id(wvif, sta, hdr); if (ieee80211_has_protected(hdr->frame_control)) tx_priv->hw_key = hw_key; @@ -455,7 +454,7 @@ static int wfx_tx_inner(struct wfx_vif *wvif, struct ieee80211_sta *sta, req->data_flags.fc_offset = offset; if (tx_info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM) req->data_flags.after_dtim = 1; - req->queue_id.peer_sta_id = tx_priv->raw_link_id; + req->queue_id.peer_sta_id = wfx_tx_get_raw_link_id(wvif, sta, hdr); // Queue index are inverted between firmware and Linux req->queue_id.queue_id = 3 - queue_id; req->ht_tx_parameters = wfx_tx_get_tx_parms(wvif->wdev, tx_info); diff --git a/drivers/staging/wfx/data_tx.h b/drivers/staging/wfx/data_tx.h index b561bbf9f16f..03fe3e319ba1 100644 --- a/drivers/staging/wfx/data_tx.h +++ b/drivers/staging/wfx/data_tx.h @@ -36,7 +36,6 @@ struct tx_policy_cache { struct wfx_tx_priv { ktime_t xmit_timestamp; struct ieee80211_key_conf *hw_key; - u8 raw_link_id; } __packed; void wfx_tx_policy_init(struct wfx_vif *wvif);