From patchwork Mon Sep 7 10:15:08 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: 261428 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=-12.7 required=3.0 tests=BAYES_00,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=unavailable 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 DD68FC433E2 for ; Mon, 7 Sep 2020 10:26:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A1E91205CB for ; Mon, 7 Sep 2020 10:26:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="GEehFPpS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728908AbgIGK0d (ORCPT ); Mon, 7 Sep 2020 06:26:33 -0400 Received: from mail-mw2nam10on2078.outbound.protection.outlook.com ([40.107.94.78]:7488 "EHLO NAM10-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728715AbgIGKQV (ORCPT ); Mon, 7 Sep 2020 06:16:21 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WOcpuNQgbkztH+G4oB5ExDGswBchCTwVjuFRWn9EtS+Wa+p80q9djXD0Cu4VmC6o3oIMn1OFE8HFVXuyO71D41Eer6I9MRPbnB4D8mkhb4WuRs1OInivAysMFFxyhoTaSqODABZtrmo9s0gelgKUULUrs8hbIevX5qS6AWxmOqMrR1MhESqigN6RsXmqkagprbZRq72nwGidK/83Jy/RZMzp6cR8qYycHzM7z7AzMN9iFFfcyHg48QbXV0WcuJJ/0aEWdecac+YW4FetsB32yDGfNT0gsZAZk7liUQ6hx6G3cnRCyemQbsaEEm0ua6Oev/aqTCGZ7RJY+GwiE/UCiw== 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=ujUlujIB6wO1ZYDJtSkyrb3rog6jRF8m+w6QhN2mNYo=; b=haYdRMZsQ/mQbHPCZBLsC8OFNEXT6eENo4n6767X5yl5+oB47skzE6PPdZI5k1SS6nrIuE6dAAXKEw0UDu6yKxzGe+wg08UBWInHohBAkdRQQHnxPWEeMc/IYg88Hz4ia+RRRX2GA0gNXrIgWw2uGNhUzA3bKTIoYWOVIgX/S3Lg3uwCWUJmFe4Y2+UXMulQzir1P6qxHs3s1yFuhIp/mkmL1I2GXRnSBpF5QwUn4KpWVUvUK7P4YQYdqMvmBzJFRFvCGLZYuN6wFsMMVdTFR/xkkKyRv3aDCR7fFWOdW2Cl/s8BBWLbqx3xgATkOjUrEzuIFORmIKLrESHPtLtiag== 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=ujUlujIB6wO1ZYDJtSkyrb3rog6jRF8m+w6QhN2mNYo=; b=GEehFPpS2BbJ13qKf1uzyznk20YmcHB1Q2SXp5JMugWwL17OPnvVq+nw1xZX2bxgvnEByMMrVDc3d73tWjPOB7rY2ZbHqJlzKA27DKkaQH3jOhctHY60aOcWY7MvUFF6erAliNekUonlGObmEKJmRm2D3HCbf8Y21LPyaSblca0= 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 SN6PR11MB2720.namprd11.prod.outlook.com (2603:10b6:805:56::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.15; Mon, 7 Sep 2020 10:16:14 +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.3348.019; Mon, 7 Sep 2020 10:16:14 +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/31] staging: wfx: drop useless struct hif_tx_result_flags Date: Mon, 7 Sep 2020 12:15:08 +0200 Message-Id: <20200907101521.66082-19-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200907101521.66082-1-Jerome.Pouiller@silabs.com> References: <20200907101521.66082-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR0P264CA0109.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::25) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.silabs.com (37.71.187.125) by PR0P264CA0109.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.16 via Frontend Transport; Mon, 7 Sep 2020 10:16:12 +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: 585bd539-aa85-43ee-994d-08d853170cf9 X-MS-TrafficTypeDiagnostic: SN6PR11MB2720: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:983; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 26zSf+fku1CJgDZNSj1WeYHrkksqERmHU5JX0DZSv+5vsQooHWvnmaYAVV/hbL0DO2b5a1LU0Lh6k4YW6r4x6/C8yyIy85bWXfziEAMcemJEIi9St9+GwpczUWkEzapDL3XeS9FbG8MVC/JRfrwYzdHXvgrYn80WtHT/zEGIyhhaVBDdW+pikUng7ysG8UVpwpvrBRL/Y47F/Q13e1Nks2767cUQ93NY5Oxyz4f4+VxjmofJkQywnaoB9kzNii9NKjxQAKS24RmIdehWRtiadeJbpuqEub4Jgys15C/8yeHt2nZf2/X18Y9BnxAWVFmGYuMPFDgkeQOGqLB7Dv+Adg== 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:(376002)(366004)(39850400004)(136003)(346002)(396003)(66946007)(66556008)(66476007)(54906003)(26005)(186003)(16526019)(66574015)(83380400001)(107886003)(6486002)(8676002)(956004)(2616005)(2906002)(316002)(86362001)(8936002)(478600001)(4326008)(7696005)(36756003)(52116002)(6666004)(1076003)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 26C4kXXEYDyiRKdFVfHOul2K/V+u9RpDh7HtpSUvSO/5HQiqHFqAEFr8IMd59YkgAMOm0LLIGLjDPw+4SKtY5BngZqKYfGfgPQ7eGCLblmQwEKE0Z/FIvv5YfRvhW4SevgOUijSqQ1lKzjHqQbGVUbNIQyo2Cf7NpOKdugId3djHuxCPX8Sr3bEwQ80mZlhItSQlNiSZWCTm2NV1ikKQ42GAjVvHeQVbFC+t7U2zasLVA1OdsIVIopjzrV0+4d42sPhOtQXZvlnI6THvGULwx5OFxTzW9yeFx+ZuO9IFW0uETK9rnMMZ+fAjwYCepJKM4YXI6dVFDn4yb+zygAW+hw+Cey+e/7+B1CtOIyo4a1PiG6TiyCqUlWCVAQV3feGmkudYMRv63wS0i4JK73IzhtyckrW1ZJ5r9eoSeSrNyseWp0iqXm4z/J4b7S/PqHhA5o2jfZLPSiEzAkHyHsl6BBtqW7yj8nKctsnXd3Zbqca7JANUuYFR8oOAHLBKbhEnD/bCBaXF0FHiyocRxrMPX78Lc80QfMqYSs5eY+XGevmnGYMqBbwI7DfLicJTkpjwALP6+QkDv/syIKcfm7WXSNbIyHiKFnstATZEqfoIrWI7dvm5nKzcIGjZCXJAnWJy0CAqID3MCaBrGWjbdvEk+w== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 585bd539-aa85-43ee-994d-08d853170cf9 X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2020 10:16:14.1701 (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: pONOz0MD3uOszb0NWpPGrrUgsizqVM14chk+86bFKo8rI96coRhLTck60b1NumI5Rf21H/7CNko9Tv3xedsU1Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB2720 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller Struct hif_tx_result_flags has no reason to exist. Drop it and simplify access to struct hif_cnf_tx. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/data_tx.c | 3 +-- drivers/staging/wfx/hif_api_cmd.h | 16 ++++++---------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/staging/wfx/data_tx.c b/drivers/staging/wfx/data_tx.c index 485907b0faa2..1f2158d6eaa9 100644 --- a/drivers/staging/wfx/data_tx.c +++ b/drivers/staging/wfx/data_tx.c @@ -518,8 +518,7 @@ void wfx_tx_confirm_cb(struct wfx_dev *wdev, const struct hif_cnf_tx *arg) else tx_info->flags |= IEEE80211_TX_STAT_ACK; } else if (arg->status == HIF_STATUS_TX_FAIL_REQUEUE) { - WARN(!arg->tx_result_flags.requeue, - "incoherent status and result_flags"); + WARN(!arg->requeue, "incoherent status and result_flags"); if (tx_info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM) { wvif->after_dtim_tx_allowed = false; // DTIM period elapsed schedule_work(&wvif->update_tim_work); diff --git a/drivers/staging/wfx/hif_api_cmd.h b/drivers/staging/wfx/hif_api_cmd.h index 3a60bdf286f3..b86ec39f2615 100644 --- a/drivers/staging/wfx/hif_api_cmd.h +++ b/drivers/staging/wfx/hif_api_cmd.h @@ -248,15 +248,6 @@ enum hif_qos_ackplcy { HIF_QOS_ACKPLCY_BLCKACK = 0x3 }; -struct hif_tx_result_flags { - u8 aggr:1; - u8 requeue:1; - u8 ack_policy:2; - u8 txop_limit:1; - u8 reserved1:3; - u8 reserved2; -} __packed; - struct hif_cnf_tx { __le32 status; // packet_id is copied from struct hif_req_tx without been interpreted @@ -264,7 +255,12 @@ struct hif_cnf_tx { u32 packet_id; u8 txed_rate; u8 ack_failures; - struct hif_tx_result_flags tx_result_flags; + u8 aggr:1; + u8 requeue:1; + u8 ack_policy:2; + u8 txop_limit:1; + u8 reserved1:3; + u8 reserved2; __le32 media_delay; __le32 tx_queue_delay; } __packed;