From patchwork Tue Aug 25 08:58:22 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: 1350902 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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=NrvyEtqy; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BbNGv4lLGz9sTK for ; Tue, 25 Aug 2020 18:59:51 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729710AbgHYI7u (ORCPT ); Tue, 25 Aug 2020 04:59:50 -0400 Received: from mail-dm6nam12on2052.outbound.protection.outlook.com ([40.107.243.52]:53959 "EHLO NAM12-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729510AbgHYI7X (ORCPT ); Tue, 25 Aug 2020 04:59:23 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m5o5QBMnm939ZwuZQ/nH8PTj/d77oFx6ip9IjgU67eOW20uFBaosOY8jhMttZhks3Zv0mYMz3W3RhArIcoH7rrXxQVO7JvfjTr9b1i0juZhAWJlBgZrgBXCZ356CQxOcLsG6KWdRaLxRN3ndu3QEsjX+bi8F+An+P5W09JaBGFcfHbgBvVbqmzpRflbe59dRyTI+YuC+xQDHd1nSOgoUxcCWaDfDqYS8GiACpJK0MI4zTN/uxaIeBcHhMhOJZBv+yIUP5eGOc8ZJy56QdXtIawMEeifA5rN7h/0aaGkHzbO9+KudOP6CIEbeskCkps/20AxWOslmL7zT1lCHwRH9gQ== 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=wQXvApKjr0cY61ggIb8gLuomgp6b/xpqnIfJVhA+1WE=; b=Z7kgomi7mgNHeIUBzx2BIchj45ZqLGq7CmE77f57o3IzX9viDiPDUICQjueF2zNw2qJKjvUa9pZOFSprM+agsTqPmDtxi6o4fFL5UoxyrFra0eMe09P3kn/e8AY7gP8/evuPvaeHXCdPbxkpTZye1brccZJPG4XSGywiciTH4lHsnMfJi0Zg12+R93xbrbUUVpoy3rOxxSK0FsutvsjwhD5geryCzN2kj109vWshHDezRv92+2c48VyRvhlrzlLkvr98PV0xKVLxv56mE1hzUyANaWRoytT85tgo63kp67r2qmzz7RDNrR/Sup3E2qljkLf3OYL/xt0Nb2ZarxdB9Q== 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=wQXvApKjr0cY61ggIb8gLuomgp6b/xpqnIfJVhA+1WE=; b=NrvyEtqyMu/TY4pjZCWW/9iNKrXBnxVQX3XY6ehSZc4e7gd0a00eg4NXv0l4Q5yT3wal1epIqOLKxGzcjiDILr8fJp5x/XO0I743qg64XD/glzBoiekTphGfMnyfHMOgKu8XuHr7KcSsxohpnXLzMHUA3DcB+z+7paVYi1B7Jqs= Authentication-Results: driverdev.osuosl.org; dkim=none (message not signed) header.d=none;driverdev.osuosl.org; dmarc=none action=none header.from=silabs.com; Received: from SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) by SN6PR11MB3501.namprd11.prod.outlook.com (2603:10b6:805:d4::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.26; Tue, 25 Aug 2020 08:59:03 +0000 Received: from SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::85c9:1aa9:aeab:3fa6]) by SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::85c9:1aa9:aeab:3fa6%4]) with mapi id 15.20.3305.026; Tue, 25 Aug 2020 08:59:03 +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 v2 06/12] staging: wfx: drop useless field from struct wfx_tx_priv Date: Tue, 25 Aug 2020 10:58:22 +0200 Message-Id: <20200825085828.399505-6-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200825085828.399505-1-Jerome.Pouiller@silabs.com> References: <20200825085828.399505-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR3P192CA0002.EURP192.PROD.OUTLOOK.COM (2603:10a6:102:56::7) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from 255.255.255.255 (255.255.255.255) by PR3P192CA0002.EURP192.PROD.OUTLOOK.COM (2603:10a6:102:56::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.19 via Frontend Transport; Tue, 25 Aug 2020 08:59:01 +0000 X-Mailer: git-send-email 2.28.0 X-Originating-IP: [37.71.187.125] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4145f010-3c68-44e4-6a55-08d848d51d69 X-MS-TrafficTypeDiagnostic: SN6PR11MB3501: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nkXgDtQLlxPEupNHJ+gf4JQpCFo+m4Dioxz6hmaI/wGmLKsikYN7QzFG5FEXVay/TIEZJ3/GS5Og24LEKhX2Wt+4UpgwmOf23kHPYhcpfPrNKgvfhAIUmm0MMlXEHqvUhrwFjXL5fWDKGVDqNCravrAGGvdMUk8GHwwqEkEfo/1kRG8ALaxBlEZbi4c9w/q5Lu9p+NEU966fmh74ToMwH5hhCJ2laAPwYacvoZfqz09V/THzKeLRepTCIa1PIsyOIcetWaUQmvM2G0ThEzNu9ISTEthaxLKqobTyNZGhT2aZa2Ioz7H7MsGPpqfxcSYuECN57xgMedRzHdu6xqsbOQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR11MB2718.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(136003)(39830400003)(396003)(346002)(376002)(366004)(316002)(5660300002)(478600001)(107886003)(1076003)(8936002)(83380400001)(16576012)(956004)(66556008)(66476007)(26005)(2616005)(186003)(8676002)(86362001)(66946007)(6486002)(54906003)(6666004)(36756003)(4326008)(66574015)(2906002)(52116002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: dKTEuBi84kABNH/nw3hWQnpQ2vcUqM39dg6KlyM4MZd+SBfnzMdC6lLArOXtskKv5kvuKjaNXgbvlKuDOxx+XiVC/P147uAgMyHHH+/OVT24m7WAqVzLDNyGdBV/7ud8K7bcxETxeVr8LtlahCrXB5W67fkWezjZHYjys7CDwIkVEa0HSBDk5zIeexIdoxDt9gcyRJ0Z2j0ZA+euteVG8Pr229TaYVR/2r0fMsI+Qnq3OtpzyJ4B1cQAjwBd5/C3zKNnOZKkEV5on7XD1+iNYRv64SHXT+7ilQxmS0hngFzrV7mVgdBwEYfIsECuZFyq6gKwOdMX+tDT9/voBEBw6uv0Mvv1NWMD8XJ8N+8dUyrUVZWcBI9bFULmixphkJQVIEIVqP3fciBok6QaGx9zH8otjwfcCTEQSXpDfQwseJgMQjWUaNZX11buI9T9FywWuo4t3/bnpkNlvSx8555Z8bI+X1DjtnLxMCEIh+tBrMp7h2Ftxq7IMID8WYCoSKAivPt/h+JGA2MtmNC4v3V0hovpE+aEd5cHE6dLHXs57vhPpKVAw/uFmg1qpJhulczlF8zYCZKsgkCuW4DiT4suiEpvSuMTQhV2wUvzbUXUS3osLIHb1bUa0b3vxOaWBD1gx2pWtxjFOlBv/pYD6vl/2w== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4145f010-3c68-44e4-6a55-08d848d51d69 X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2020 08:59:03.3545 (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: 9J+wo7m+6w4v87i4l2BjIZFKTrBDiRkfppf7NR7M9LeHfXmqN46HRrLLf+7mU/d+3DRRwEhNHsKPTgWVjWkPKA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB3501 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller The device need to receive a skb with necessary space for the ICV. So, the driver adds this space before to send the frame. Currently, once the frame is sent, the driver restore the original content of the skb. However, this step is useless. Mac80211 don't do it when software encryption is enabled. Once we have removed this step, it appears that it is no more necessary to keep hw_key in tx_priv. Then, it is possible to simplify a bunch of code in the Tx path. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/data_tx.c | 16 ++++------------ drivers/staging/wfx/data_tx.h | 3 +-- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/drivers/staging/wfx/data_tx.c b/drivers/staging/wfx/data_tx.c index d16b516ad7cf..485907b0faa2 100644 --- a/drivers/staging/wfx/data_tx.c +++ b/drivers/staging/wfx/data_tx.c @@ -336,7 +336,6 @@ static int wfx_tx_inner(struct wfx_vif *wvif, struct ieee80211_sta *sta, { struct hif_msg *hif_msg; struct hif_req_tx *req; - struct wfx_tx_priv *tx_priv; struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); struct ieee80211_key_conf *hw_key = tx_info->control.hw_key; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; @@ -350,14 +349,11 @@ static int wfx_tx_inner(struct wfx_vif *wvif, struct ieee80211_sta *sta, // From now tx_info->control is unusable 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->hw_key = hw_key; // Fill hif_msg WARN(skb_headroom(skb) < wmsg_len, "not enough space in skb"); WARN(offset & 1, "attempt to transmit an unaligned frame"); - skb_put(skb, wfx_tx_get_icv_len(tx_priv->hw_key)); + skb_put(skb, wfx_tx_get_icv_len(hw_key)); skb_push(skb, wmsg_len); memset(skb->data, 0, wmsg_len); hif_msg = (struct hif_msg *)skb->data; @@ -489,7 +485,6 @@ static void wfx_tx_fill_rates(struct wfx_dev *wdev, void wfx_tx_confirm_cb(struct wfx_dev *wdev, const struct hif_cnf_tx *arg) { struct ieee80211_tx_info *tx_info; - const struct wfx_tx_priv *tx_priv; struct wfx_vif *wvif; struct sk_buff *skb; @@ -499,18 +494,15 @@ void wfx_tx_confirm_cb(struct wfx_dev *wdev, const struct hif_cnf_tx *arg) arg->packet_id); return; } + tx_info = IEEE80211_SKB_CB(skb); wvif = wdev_to_wvif(wdev, ((struct hif_msg *)skb->data)->interface); WARN_ON(!wvif); if (!wvif) return; - tx_info = IEEE80211_SKB_CB(skb); - tx_priv = wfx_skb_tx_priv(skb); + + // Note that wfx_pending_get_pkt_us_delay() get data from tx_info _trace_tx_stats(arg, skb, wfx_pending_get_pkt_us_delay(wdev, skb)); - - // You can touch to tx_priv, but don't touch to tx_info->status. wfx_tx_fill_rates(wdev, tx_info, arg); - skb_trim(skb, skb->len - wfx_tx_get_icv_len(tx_priv->hw_key)); - // From now, you can touch to tx_info->status, but do not touch to // tx_priv anymore // FIXME: use ieee80211_tx_info_clear_status() diff --git a/drivers/staging/wfx/data_tx.h b/drivers/staging/wfx/data_tx.h index cff7b9ff99a9..87e1b9b62dbb 100644 --- a/drivers/staging/wfx/data_tx.h +++ b/drivers/staging/wfx/data_tx.h @@ -35,8 +35,7 @@ struct tx_policy_cache { struct wfx_tx_priv { ktime_t xmit_timestamp; - struct ieee80211_key_conf *hw_key; -} __packed; +}; void wfx_tx_policy_init(struct wfx_vif *wvif); void wfx_tx_policy_upload_work(struct work_struct *work);