From patchwork Wed Oct 4 17:28:38 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: 148436 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:254a:b0:403:3b70:6f57 with SMTP id hf10csp291975vqb; Wed, 4 Oct 2023 10:29:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHih+FJ9dnVqy3n53sF3hgcUtrF0f6zRzTVUrS6Td8sQuN1kEiBK/H7d72R82ctOVMeDuWs X-Received: by 2002:a05:6a00:1495:b0:68e:2b6b:2723 with SMTP id v21-20020a056a00149500b0068e2b6b2723mr3383548pfu.29.1696440559900; Wed, 04 Oct 2023 10:29:19 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1696440559; cv=pass; d=google.com; s=arc-20160816; b=UzoGot46kgF9sl4j/pr0YZIMZPHK9kNeDAIPnmUkNsHKbgGBEsYcj8XtWg3kKjBYVQ hOLtnRBKPVUSRzgtKMVFt2WIRpAyW+4/C/Jse+4Wr91hp1c5oPv4qT9zKhJ/+Gv4O+6o nwhXgWA0AYhZSd5XytCY8BU4i2a14RBtos+Hr8oPC1imKH9d9EcxhZdQ/L50Yw7ecnwk H/cqZPtJGOyS6ZMYPDNCYaWqtKPw3UPT64ltAgjTZAw3v2L6AmVzCgwictYzfpd/NOm7 TkgvUrexm6e47fad3AaLWVIdOpMDaM/m3ebOPLvysrwQa5SOEM7nIoOKVpVsRULlj7Sn GSkA== 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=QfpwanSBHJkQObywZA5zI2MQPY0mjuebBRmLLyS3/Z6E+vUze2euvnzjSrdUW+9xlu t5sekKzayuzJAIlypsu4Jkq9gjH+a+PwwgN0IcBGQZ8B3/iqHiDIyuxKhVWAJ5kciOyA oX5sb6yFHzvgy5jgg7pxj1CBhHDEzP0AX+6ZcpRNI2YMqv51V8p9FhTM94PQwLlwW78M +wfJJ+ZtgYAZs803DLry62H4ZypURwrJnOcvuyEUVadI0SEGNWqOClmXmtg457UUS/pG kzSR8a1T/Ar40MTDapL+4cdyshcmt/HmqTXmqVzG2dugpLARh9/c7q2MkmrCUJJKeHYT gW3w== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@silabs.onmicrosoft.com header.s=selector2-silabs-onmicrosoft-com header.b=DsYClD3F; 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 cd26-20020a056a00421a00b0068fb8fa1e71si4114241pfb.207.2023.10.04.10.29.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 10:29:19 -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=DsYClD3F; 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 C05658374384; Wed, 4 Oct 2023 10:29:18 -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 S243701AbjJDR3O (ORCPT + 19 others); Wed, 4 Oct 2023 13:29:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243698AbjJDR3L (ORCPT ); Wed, 4 Oct 2023 13:29:11 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2082.outbound.protection.outlook.com [40.107.94.82]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05509C6; Wed, 4 Oct 2023 10:29:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fzhEmLqZTWK/E7tYnq8b7SCCYwrECuTcxDsjtdqz8rwtgwX9ljPPjDxTvfHclOUIALnEGnsmYY7SGG4+pz0TOQb0CHuZgKCMkdvc0JrUQCENgIIHB28uvOXhKwkgY6VQEEI8Y0KbK0T8sGupRzik8ALh3P/jLFukisl2mqlQuQHgsq+txmk7eskhusSfLWXtc/0vO6+jRDzebZrvGCkVfIXi3ksdomTdQV7dpoFm7eabpk/yplX9wajnud3RS7BTR7/pCYwieL1Yw0oWcUfTOiiYQokVTVaCGigaZnS+NXV7KH5kBP31ZlQtBlB+n58xmJHGklqHD/M/9tGO+O3jew== 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=ZnYZmvPqNbdn2FY20SPI8mEI3Ll7MqB3DYhCZ9VKF4ASCKfhXagF5piyGdRDA1tUX6edWFPEfdTK4nXBbT7hYBebbB1mfeY4lVcXMuSgrDoee0g6ewud+fYOybTyIkRUgvlxvAwezyHjhGhU+iGlRIXmco0E6coHyaSs1/BrC3twBtcTKG1WmFOavN/iLa04s5TvaaQE3LDXrY9EKnXyZ/rvtGe51kVjJKSotMCdBn3xm/jxsU94ej1mk51zmMhlO3/QHdBt5V8lWsjJL89IBGIL4KwkgUMc/n3tClpISUjSXz41PBSA6k2VXio58L+YXlFgQ7Vy0mLP3zmRyHYXDQ== 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=DsYClD3F1hb8tlx6MGj12XK6Jb/TMzdjDZXSxUKgdhmFJIfVZEbfkDwBZmbH3bXLgS3V9TL2RTGbI56rsa5qYl82IzerkWJv29Xp805Jrz6DiPXTW5zUzMWQ81EdLMbhkNvRb+y/lWBzBMdm72TxLgge6UM+6ylx3yuqol0Tosw= 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 PH7PR11MB5982.namprd11.prod.outlook.com (2603:10b6:510:1e1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.34; Wed, 4 Oct 2023 17:29:00 +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.6838.030; Wed, 4 Oct 2023 17:29:00 +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 v3 3/8] wifi: wfx: move wfx_skb_*() out of the header file Date: Wed, 4 Oct 2023 19:28:38 +0200 Message-Id: <20231004172843.195332-4-jerome.pouiller@silabs.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231004172843.195332-1-jerome.pouiller@silabs.com> References: <20231004172843.195332-1-jerome.pouiller@silabs.com> X-ClientProxiedBy: DS7PR03CA0305.namprd03.prod.outlook.com (2603:10b6:8:2b::25) To IA1PR11MB7773.namprd11.prod.outlook.com (2603:10b6:208:3f0::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA1PR11MB7773:EE_|PH7PR11MB5982:EE_ X-MS-Office365-Filtering-Correlation-Id: 96a3ed65-6213-40be-c91a-08dbc4ff64f1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cAai/+v5EiR0UyMEBN7cY1b7yGJWGiJWIAWHtNIpBDZVVB1ld+K53U5Lws2Fouj2HRWyCoqJipoNpgbIWDpCy+JlRH4ys+8Ha2o7r4JiAJ3FdXFwrVVYT3v7GRVwbmuin8panSxHMHS7FNFBmGa94yf+WCUzW7MUzeEzwawz656zhLV/sdCfJmAnd9Hi98/8edcdI8gizVHfgAoQOW77Lojmlyyw6QYmHzZEN6EnJeaIIBREKN41iyJ+g2GNRgm3sB1r6tsrOEzBVxLz+pJFj8QO6lW1A2XtIpDkhGE0HTzCQqg4yAizubxfUsfY4uodu49KJx2d2szv5Devu1FkjoYNbNiDHd9qYtgl/q89oJsSBviT2ToYp9KsmrAYu8f9y0HRbQW8sc/S8/mlaaZU8FIgvHEd6wYvXPF+anO9H1a7lxClqPu03RIOlKwogtZbyoFmLnk+jdThNqvX7AI3d4zafpM71RMnQlR/0oe6/TZHl8XFPeQilFr+WabpYXGkoAUnIIGMyCMtcznFCIiMtQ5vKQHUes+Df+z5p3ZFkLCpayt59DEuDQ1IXJ/81sRp 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)(366004)(346002)(39850400004)(396003)(230922051799003)(451199024)(186009)(64100799003)(1800799009)(6486002)(36756003)(6512007)(38100700002)(6666004)(52116002)(86362001)(478600001)(6506007)(66556008)(66946007)(66476007)(316002)(6916009)(41300700001)(2616005)(107886003)(1076003)(8936002)(4326008)(8676002)(66574015)(5660300002)(83380400001)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?ydGK5wVtFhx0uE+7wrXCwuX3gE5v?= =?utf-8?q?vXovTzpD5AqewOEoRvC2VERRKcl9x7JB2NVtdq2yin16ZCB8tQQcy1WnfT5Gl9EJV?= =?utf-8?q?nAxgn8Epd5rStaZlOmw1W4lb1uw+iQycFEc4UKkt9qNmSf1gsH43YAXyCzby6avgZ?= =?utf-8?q?L9en9xlKsCb4/xrEmNjh6UcFLmNQkGFY6S9yoRA7WOZQH4x5SOfwBFYjpASSo1RxJ?= =?utf-8?q?F3m9qW7Y0oH5thwiaCHfqTum6L2qRY2uOk0tmiUq0i4/uZxcml49SABzW3t5yg559?= =?utf-8?q?FEIyIlTcurDH5QW9gWIxGht66Af4rFcuTNYxBLOvTh+AyOJ9H9dgIgPAPC47TILIQ?= =?utf-8?q?Z1VzLWFfu7JmAEVb+DavznvCgT+kzpg9wx6/VpucKJE3EsL/HNrAA6z1Geg5mTWXB?= =?utf-8?q?SzrE23BTsy3sD3N61L/pbZ6dYnUTTSNfpI90P0ayVU2AKAcZL6XOZScCvWNRYjb3W?= =?utf-8?q?68wcVBmaK5KyqHBdN0P0sXA+VPxrpS5dRoORNuOGMdfw7Gb1V4yH1LRTSmrITAvp5?= =?utf-8?q?ju2t5//Jn9zDrAwgwz/7OTFGUbtSHF1vzS+T5YLij4lrXp/16OE4zfxftDpXRSPqn?= =?utf-8?q?IIYa/R5jH4NmV5eYk8xAXOLupiK/fS/5lFHm27vRCRHGQ/7KcxQLiJ4SkprfyB6k0?= =?utf-8?q?UQTgpTVlWr0fMnk+w2SgD/nu+5eF/Hx4ooYTi9ZlJHxaqm+sC9MX85+66cnauew0g?= =?utf-8?q?pJwfn1bE8EnpmX38yFXVX2tMi1bKTRU5IWnz2MNBwi9GSatyIxqXqr9r18wQ0buds?= =?utf-8?q?1lD4cYULP266uFd+JnqG69I9kDTtYyJTtklCfU9pJmUensR4ulNdud4ORaI3tmaQo?= =?utf-8?q?f8EDg+pqIvdkTyI7zdyMzmWs2UPfXoWPY8CgIKSVGxzjeGYPgfc8T9aG+Ox911M0X?= =?utf-8?q?LjuucT1Lbv39oA81hQcP8spM8LabYSRYjMVJJeF5FjrZS6YMAkjWSRxNjpi/JvA17?= =?utf-8?q?fn7O8P06+Ck+7F7j9SFAC3bxX5A0hMdLCgiogSj3jjl2YewlJvRLPEJ98QHsaM5Gx?= =?utf-8?q?mwzJcC9LBrfI1eVyiEDtLK2wEeX1Iy4EflGM4h3iqA8scPc/UG9Olj8N+ZOhHNdF+?= =?utf-8?q?x+WKbnWEzNl1ZtCpUQZuWMHwPuO4xifDhzaxOb8OvmOT0czjw2mt+YMmfwHtHKTtg?= =?utf-8?q?yUmQQtLhwkayJwpRdul6HG0NUwIN/1/exu3J9irf2VMGw+G0+8lhRJK0/3Che0zpk?= =?utf-8?q?kR+qJ+m+dMoaCqfLnaa5GPOsWpNVqgQRP1nnUihCZxg+BI07CW5cDBan1Pwk5FBlO?= =?utf-8?q?yc0hEAmG54uC5LwXQ8aEcW8An1s5LY5BU2n2DhtMLZTgEJLhIFWVRTJLJESgsSf5L?= =?utf-8?q?Q28phNQb9+1yHF9zz2GX41xQYPBVfLdzwEOhMrFEdnK46/rvLeI2eoidk991YYK0e?= =?utf-8?q?Caqgn18bbEF9+4+KunmNlK2jnKzCA004R3idFPgGiQHya8ZHU3LLSLiVhp3GzHd6I?= =?utf-8?q?Zewq6NbJ8ZuPCQOgibnO5D11nvAO4cFuZxrKo/LJ8ddDrhX5u6n4Inq9eFOPvxtml?= =?utf-8?q?dGWxPbiy4v1UQsKUSvgz5X4DRPzUUrbT9Jvh1LlQTxXHxC9yDYAqKx7+tu88kbsiz?= =?utf-8?q?SI4C8QHEdGq?= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96a3ed65-6213-40be-c91a-08dbc4ff64f1 X-MS-Exchange-CrossTenant-AuthSource: IA1PR11MB7773.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2023 17:28:59.4420 (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: atBr3ZKTFmXdbGgCLnhQ27llKTyNV+aCWoQ0XYqwosJaEi6DzbAQ2nVxaEla2+B81IJKMIZ6zS7lJzwPHpUOmw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB5982 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,RCVD_IN_DNSWL_NONE,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, 04 Oct 2023 10:29:18 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778846856503104406 X-GMAIL-MSGID: 1778846856503104406 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