From patchwork Wed Sep 27 16:32:51 2023 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: 145571 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp2869103vqu; Wed, 27 Sep 2023 13:00:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGcD2Hgkx6newDLNVQtTtlF0h8IVv3KHibQuX394eUVsSj7OD3jkLcipUGb6fmZEDJkVhvJ X-Received: by 2002:a17:90a:f581:b0:26f:392f:f901 with SMTP id ct1-20020a17090af58100b0026f392ff901mr4895635pjb.14.1695844839931; Wed, 27 Sep 2023 13:00:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1695844839; cv=pass; d=google.com; s=arc-20160816; b=cUvKSSB2gOHPLw4RT45ZN7t3AD8i3cqcVKNDcULhpi5VifTIu9FrNStrO1ji0KcU2P tLzVcJSykT4OLGmGHZffIHhMH8jEjVOVPkaqjfZh49+nYe2slA04SfIA2qZ/3yPlDpXC 6KAQkx8lOR1sfkSUsrAWmirW+bdcJ70MXBVtg5Y7FAaI6tX1p7oqGnhBKU5Op9CgKBVn nuIwe09/JD8VDaAFcsmULUccu6NsZfEXQtOdMdvCyVnoQQ3A4zurRGoiNFkNluTf6SOR xeqFeVAUM4ixWF/1yr+4Y5MBvR4AzdxSNa7PCgAaGJWYC+9zveXLZsZqxQbHV5YeqtqT V8RA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bjGVnnI4IgQWVESipP4NJkbr9TxmMmdc9cZT7TgzWTk=; fh=l0GbbulFVEGIByrdVk2PDAYC0467jisoj0AJEvNmoTE=; b=rXIIs8BEOMXqqPvBhxrHR+2GWiILmgUFbiiP7rGtnK4pk0SpuxZhKDy3Bamt78+US7 dkTJ/wfG007fqNOPoWLGUApA9MbFFGybGo2du2IGZhEA0Tkd/iZKGRqbxGKgLRGOOl4J ICZ1d6Hgm+84lGHfmqFSYhVnzREUoidA0jSHzeRjCt0uuwgyzWJRh9yRA52garN2YP1j EA88oOTymm4L8TK8t/pkSUHJuhzclA/V9BdqD633vOtcZbkZAIOYO4Wfk3S6B7XiCgGV RffodVARjDkOPGqTVCoK6Issc0Uf0mdBdK1nfVrg8oxv01fkFPqtYZHJ8CrA+uFK6AIv hZIg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@silabs.onmicrosoft.com header.s=selector2-silabs-onmicrosoft-com header.b="a/8E8/TH"; arc=pass (i=1 spf=pass spfdomain=silabs.com dkim=pass dkdomain=silabs.com dmarc=pass fromdomain=silabs.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=silabs.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id gt3-20020a17090af2c300b0026f51be8d51si3207751pjb.82.2023.09.27.13.00.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 13:00:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@silabs.onmicrosoft.com header.s=selector2-silabs-onmicrosoft-com header.b="a/8E8/TH"; arc=pass (i=1 spf=pass spfdomain=silabs.com dkim=pass dkdomain=silabs.com dmarc=pass fromdomain=silabs.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=silabs.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id AA08D80A6EC4; Wed, 27 Sep 2023 09:33:45 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231959AbjI0Qdf (ORCPT + 19 others); Wed, 27 Sep 2023 12:33:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231889AbjI0Qd3 (ORCPT ); Wed, 27 Sep 2023 12:33:29 -0400 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2088.outbound.protection.outlook.com [40.107.237.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BD459C; Wed, 27 Sep 2023 09:33:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mX6B+q7wBOAf+fpj6LfIlkq8LhGcB6jUCbC2jBkrX64y2rQWQkO2SRMTPXwLPFRajTiPLrPoj1tfKJ3+HzPQ5EkD6jrOPQUi8WV/XAXWeH/TrZkgeX7Aiy4pSOf6SWDex1zhBRsbhFVhuiTxqNjwsGVoAQho4Wn/E8/P5PjPXJT6sXdk1tBkO0j1uQXefek8nVvVXey7dRvvOtGIvO59M9NO7iF77wdR1fkrMQs4kSywPushYZBiEHyOjRRGwkWwpaU5becviAfIT/qJsDiy3u1EydPaniiZ1/iWyQtct6Pc5zXn0Mmdsh+F0IjiXKDyknRFDptRIvAsLVNLEDvDpg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bjGVnnI4IgQWVESipP4NJkbr9TxmMmdc9cZT7TgzWTk=; b=MmOPiZAsFxLiYLxNARVKx8lfkpYJyPYq+C1eKoWMw3T5IEqsfrS43xzWl0GQDVpJ0KY/QOl6ZJU5//i5z5t2faWllY55Oa8ItFhP2ZbJRxLauaUy2nHh7tczpBfPn7xgrL8yLOpbruJtha+88HYGzw+FH47kW86yFFttDoNrP2AjKjIJ8KLtRKHWHM6VF5guwoMWEg+5bVH2K+MJ1MnJlK57GpQ1QdgCXMwghfXy7Q5AidNcPGaVQUbazyzAEBQQciK8NnKSA4Mq6vVbZxjpTvRV2NAf8NtLkrTTu3JCTWcvq3WC441qD8KzFI1HJlVhu0tnOcbvdHHbqqtcCKkImQ== 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=bjGVnnI4IgQWVESipP4NJkbr9TxmMmdc9cZT7TgzWTk=; b=a/8E8/THohuDiSzYM1SUx0C24DkaOEHc4oRrmsAh6LfaeOzIqfkvdPijWpty9DADIY1eZ77srjQq3y9Tu6asmtTGYFbM+yqmqCrvh6/pdigdShvKNZusQP9Nj2vSbkgXA2InnRKzt9T5A87mTW0qYT0I/oyGEDzbjhKziWlWMdw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=silabs.com; Received: from IA1PR11MB7773.namprd11.prod.outlook.com (2603:10b6:208:3f0::21) by CO1PR11MB5041.namprd11.prod.outlook.com (2603:10b6:303:90::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Wed, 27 Sep 2023 16:33:22 +0000 Received: from IA1PR11MB7773.namprd11.prod.outlook.com ([fe80::d6c8:4cb6:2594:d8f3]) by IA1PR11MB7773.namprd11.prod.outlook.com ([fe80::d6c8:4cb6:2594:d8f3%4]) with mapi id 15.20.6813.027; Wed, 27 Sep 2023 16:33:22 +0000 From: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= To: Kalle Valo Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH v2 3/9] wifi: wfx: move wfx_skb_*() out of the header file Date: Wed, 27 Sep 2023 18:32:51 +0200 Message-Id: <20230927163257.568496-4-jerome.pouiller@silabs.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230927163257.568496-1-jerome.pouiller@silabs.com> References: <20230927163257.568496-1-jerome.pouiller@silabs.com> X-ClientProxiedBy: DS7PR06CA0052.namprd06.prod.outlook.com (2603:10b6:8:54::30) To IA1PR11MB7773.namprd11.prod.outlook.com (2603:10b6:208:3f0::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA1PR11MB7773:EE_|CO1PR11MB5041:EE_ X-MS-Office365-Filtering-Correlation-Id: 26190cda-6aec-4c13-3bd9-08dbbf777628 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EAYu9IiEHe3gYlAO6UXQyoHXS79n01TxNUXaFWkRtREJYcr9XwqPNgAekqztOb/0jMIGvza4wGELAfxKgDHD8GpiMObmMpOhlJMTh/qX9znQyVDuTOFGodX14Rh+YhFH+lGoY74j4yLA8GdlqCy9EHm9zdILxxKiw1rthXLj4is0Ms6Pf+8nAb7XwILNuSXzBEOhB55ipC8AhWZdyiSiml8hbgXyIPHtRYmHqLN38uGbsv1UhdH95qM2nSckxxqIW2qfJoKt8VbUSK5e5M0rB6XbNY5ao9rVAKJX833d2xSdDGFjFzwcb3wLtTlwWDLqvjp2OK+dbbHAo+Enp4meJHiVWBfUmMdFtxOY1dt9/HDZM2PuWkFtws/N4OpV/8dqAQIptrp7CuuaW1nHGkiiw6dm0PaZLgWVFe7wqNWeljvuhUnDAJvW7aOGNZUkFRflgq+sFHiGvCgmn9Wch3SjOiJ0/pSk7sXSewh+hxPdiJoeV0Rb9vXe9O324+T0nJknAD1u+du4iL+vJeq76RCLcQWQd5A2IWRy65Tn8IhH0MQ8gIsTl22WptaPOEGL51Zi X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA1PR11MB7773.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(346002)(39850400004)(396003)(366004)(230922051799003)(1800799009)(186009)(451199024)(6506007)(107886003)(66574015)(66556008)(66476007)(6666004)(1076003)(86362001)(6486002)(52116002)(6512007)(478600001)(38100700002)(2906002)(83380400001)(5660300002)(316002)(6916009)(36756003)(8936002)(8676002)(2616005)(66946007)(4326008)(41300700001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?c8BT6w8cmTLThhLFPSto0wOSf25s?= =?utf-8?q?19PpsrQfvphT7SP2BibabwaN0iyTJc9R3iVy+qxeMblJdDhfZfChKnUbAsjtvJjTu?= =?utf-8?q?Hwe5M5Wx5Wh0UdEzeKPuk/H54VmAzoL5m3wdFmxDG2TEWP6CkjjdD3ppdei/+7+KT?= =?utf-8?q?yjUKP8fcQunwwGCI25Op3FxHvkVdU8KgdEBXDdjV0SmGFgunJw4aKqbfHVim8MEws?= =?utf-8?q?EMTK4+QGpq0S9qYqDuiKgSkRc15tqBj74nY4UlLPA29Ft04ihvZKDO+Uo5WFT1N7G?= =?utf-8?q?QVw3qAyWotTtTFxUDabSpZB5WSsswXzR0kIvuuuQEcqqjWqtPwSihsnqNMTB/MU+V?= =?utf-8?q?Lt0ejU1MkSPABCfFxhXcFia7lELP7j6qmBW+0Mve6zGqsn1UDYCu40fQaPQPHuxHC?= =?utf-8?q?PYU777yfE3LBq6Od7P2jia6+Ca79nFwCyIV6V6dOTEtMWVPa5wrVouXQieFLlXH0/?= =?utf-8?q?Ow5tpZQ5XaDN5j+1lU/bkALoFHHA5rKzPYLXx5GOWqqSTU7OS0tkuG9wQ1kWLAjHq?= =?utf-8?q?aevND+V0nKO77n0RjFdRwn0FxGLL5yUT3iEWPIENqI5slPXQ19ynCJEzdbQ8WdZdu?= =?utf-8?q?0ehrwc3mTJmy6JpUWrCU3lfrdtdXoMBuwqDSEpWnbo0+mOFTaiyydhmqyhAz+UQT0?= =?utf-8?q?IRofoXxcaYW4gH52JjXkyE2Y7PgRFlZf0xTqaIUgVUUaEWIRmAtWyi/l/P8bAYchJ?= =?utf-8?q?umX+ujzdOA7sm0w31ARNm3XoXe4v/YYAebFkFUSmNZsSM7tCuVVRGNcUWx9aiVqgh?= =?utf-8?q?TGCS8M4Xp7Do19RYaTtMI6NLygACjYfY4mu0ha+EcTDhRZGycYcBQqIVqWxpfMNP9?= =?utf-8?q?EfMXeHZmygaGX0YJIrnFGRXYBlB1gIHSY3iku1lJeQ1DediXNeJLqwojGOtRA+ft5?= =?utf-8?q?VRwo+LnEmvTqTpDzGVUhp7UWOlxd3Cdg7+qs+7JtEoYTP7CExbID9gOmw3XxV6C2O?= =?utf-8?q?GAmXf5yb5ydAL/Ql3RfI0oQicy16lgGl2Rp/8TLTtIifqR1W0Gv1msZufWZbS7RjY?= =?utf-8?q?yQgpCqk4Y5bAcKjKQpG2fFhlnVpqkyk/OJ19Ix+6HDXD6R2A7UacOmRhBaXd7ljb1?= =?utf-8?q?2ZXuhjqf6iLbpR/phed3Isry/qKqVT0q0nkFx91XstUxgmZBEOSVzx9SHTA1BL6Sr?= =?utf-8?q?siMp2Uzw5791Y1AeOmKLBrCTA9RsF/MG4Y6UytkvPsnmuilvnbQYNM8ZJbLvl7LeQ?= =?utf-8?q?Gj0chQJTGofq1xNzbqC3tR+jNMdYtfs4kRP8y50XeijlU0qEK7NDD4iek3yFDYg5u?= =?utf-8?q?WsQ4AmPN9imE0Vo2I7/sqJ6AwBaqQoYD7CohW+xO+3epOyRnuU6GNYv7IRWJO7jEb?= =?utf-8?q?HYFe5+cU02NMIc+/h+W5plQvTSTloAp+79XBGzBTzcS8CMjHe+fQehYVNTcyJuXzJ?= =?utf-8?q?2VF7HomRUaDSVHPWn+s4PartDl1YsdiGAGrqdElnGfon/PQU+BaCy7PLe8NhNtrfc?= =?utf-8?q?/+XvGCiwZBA6XRbZldqcTVncsJSPXKP1xjwlWIl2Z6x+Nh9lvrsFzy6/EwF0d5wso?= =?utf-8?q?SxU8UAaCpjkodlJkyFZ8xcMT36JBpqoxvZs2/0I4bGLmiXV1LdI+3yxmbvVA30EIU?= =?utf-8?q?m2qDybL1cv5?= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 26190cda-6aec-4c13-3bd9-08dbbf777628 X-MS-Exchange-CrossTenant-AuthSource: IA1PR11MB7773.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2023 16:33:20.9615 (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: e71hDkJ9nREtzBGh0Vu4D6qNDPXNrrZxT9Iwlf8Q+/IQfdrsLk45EHyqnXqdtS8icl3Aj9xrbJwDnQ0yUfWMxA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB5041 X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,SPF_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 27 Sep 2023 09:33:45 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778222198530409244 X-GMAIL-MSGID: 1778222198530409244 There is no real reasons to keep these function in the header file. Signed-off-by: Jérôme Pouiller --- drivers/net/wireless/silabs/wfx/data_tx.c | 18 ++++++++++++++++++ drivers/net/wireless/silabs/wfx/data_tx.h | 19 ++----------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/drivers/net/wireless/silabs/wfx/data_tx.c b/drivers/net/wireless/silabs/wfx/data_tx.c index 6a5e52a96d183..ce2b5dcfd8d89 100644 --- a/drivers/net/wireless/silabs/wfx/data_tx.c +++ b/drivers/net/wireless/silabs/wfx/data_tx.c @@ -208,6 +208,24 @@ static bool wfx_is_action_back(struct ieee80211_hdr *hdr) return true; } +struct wfx_tx_priv *wfx_skb_tx_priv(struct sk_buff *skb) +{ + struct ieee80211_tx_info *tx_info; + + if (!skb) + return NULL; + tx_info = IEEE80211_SKB_CB(skb); + return (struct wfx_tx_priv *)tx_info->rate_driver_data; +} + +struct wfx_hif_req_tx *wfx_skb_txreq(struct sk_buff *skb) +{ + struct wfx_hif_msg *hif = (struct wfx_hif_msg *)skb->data; + struct wfx_hif_req_tx *req = (struct wfx_hif_req_tx *)hif->body; + + return req; +} + static u8 wfx_tx_get_link_id(struct wfx_vif *wvif, struct ieee80211_sta *sta, struct ieee80211_hdr *hdr) { diff --git a/drivers/net/wireless/silabs/wfx/data_tx.h b/drivers/net/wireless/silabs/wfx/data_tx.h index 983470705e4bb..a5b80eacce39a 100644 --- a/drivers/net/wireless/silabs/wfx/data_tx.h +++ b/drivers/net/wireless/silabs/wfx/data_tx.h @@ -45,22 +45,7 @@ void wfx_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control, struc void wfx_tx_confirm_cb(struct wfx_dev *wdev, const struct wfx_hif_cnf_tx *arg); void wfx_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u32 queues, bool drop); -static inline struct wfx_tx_priv *wfx_skb_tx_priv(struct sk_buff *skb) -{ - struct ieee80211_tx_info *tx_info; - - if (!skb) - return NULL; - tx_info = IEEE80211_SKB_CB(skb); - return (struct wfx_tx_priv *)tx_info->rate_driver_data; -} - -static inline struct wfx_hif_req_tx *wfx_skb_txreq(struct sk_buff *skb) -{ - struct wfx_hif_msg *hif = (struct wfx_hif_msg *)skb->data; - struct wfx_hif_req_tx *req = (struct wfx_hif_req_tx *)hif->body; - - return req; -} +struct wfx_tx_priv *wfx_skb_tx_priv(struct sk_buff *skb); +struct wfx_hif_req_tx *wfx_skb_txreq(struct sk_buff *skb); #endif