From patchwork Fri Apr 10 13:32:30 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: 221287 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=-9.7 required=3.0 tests=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, USER_AGENT_GIT autolearn=ham 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 D6227C2BA2B for ; Fri, 10 Apr 2020 13:33:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9EBE320769 for ; Fri, 10 Apr 2020 13:33:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="Gb6NmkZn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726897AbgDJNd2 (ORCPT ); Fri, 10 Apr 2020 09:33:28 -0400 Received: from mail-dm6nam12on2082.outbound.protection.outlook.com ([40.107.243.82]:31903 "EHLO NAM12-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726864AbgDJNdZ (ORCPT ); Fri, 10 Apr 2020 09:33:25 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ks0tzMRNSlp+K9JFj2EkLMSGAGWpQxjjyfvgkq3dNDBW5WkjAcO5/231P0BsqGmMoSEIjfwKw1QZvvZeEKm1xh3fgkdPwuynuiicFwAdvB+nRf9TWs7E7QwSQ90pWGnUELPKd8FMjBzG2n7elLMxa3GqJec01iuEQpNMohkRJogyyE20lAhx+r0IVx3Y5hC0rghby3bLYkeKEUxKSQGRzLq3ohzyisYP/Au9RWR1XPdeVHDjx8xOsxQJqu3CvfY5BnatOG74n+GSLYv9t7uFrBGkjGELbGHKxGMTVYH+YOxe7Q3G/dst87ei7/57nQIqbchsJyQCiMmH886l/kLXkg== 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=nvcvWBQXy23qgYN6qax3oOEPpAc4Ie94rn39rMo5Ljg=; b=NYQjyI1mUhYp8sqYNBERvWeKzwp12kzvrGvM3xrzWXxz7CEUi7Xuv4RBfNgA20oV8BE/pLeOJhnSHSBuRiYB0nLzLdGvpRXB2VcATQgVHU+vKKrSn/GOxUiSevxJHNjEzvrB7gXpMTe9pJ6Yd+mx1OKeDn3TFcZGni6GtGNMynegCaQ8NiuYSLgZ6AJwzpuqfQ6qsiRy47DHRU+evTrdhr7odRbI6bRpqmbzznT6Y5I6lpWxMgd9jJeasXLkpgoKgUu/sJIWiPvvCL6ZjIqfH4k+FmuCE0lJ1GCfeaLj/uzwEqdag78w2aMFKdPbK1tP+aZi0lOwNN6GXmqmE3fXNw== 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=nvcvWBQXy23qgYN6qax3oOEPpAc4Ie94rn39rMo5Ljg=; b=Gb6NmkZn2NtEzXkvhe4PBl2zu+3+zhuJ9VKYwUlZqDrbWtCR5k3W8XUo2VwDN4u/Zd8m363fhN6oce2QpAb05BbUz33h/rLNL+LB9eJEaW34ycrVBF5r4ReDzKxd0cv1PgEjFdFcqiWxGMeesuSOJ1d5I9ESmmqF3qQP+CpilWI= 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 MN2PR11MB4398.namprd11.prod.outlook.com (2603:10b6:208:18b::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2878.20; Fri, 10 Apr 2020 13:33:18 +0000 Received: from MN2PR11MB4063.namprd11.prod.outlook.com ([fe80::3d0a:d9ac:3df4:8b1]) by MN2PR11MB4063.namprd11.prod.outlook.com ([fe80::3d0a:d9ac:3df4:8b1%6]) with mapi id 15.20.2878.021; Fri, 10 Apr 2020 13:33:18 +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 10/19] staging: wfx: drop unnecessary condition checks in wfx_upload_ap_templates() Date: Fri, 10 Apr 2020 15:32:30 +0200 Message-Id: <20200410133239.438347-11-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200410133239.438347-1-Jerome.Pouiller@silabs.com> References: <20200410133239.438347-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: DM5PR15CA0056.namprd15.prod.outlook.com (2603:10b6:3:ae::18) 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 DM5PR15CA0056.namprd15.prod.outlook.com (2603:10b6:3:ae::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2900.15 via Frontend Transport; Fri, 10 Apr 2020 13:33:16 +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: 900041d9-e2ef-4dac-68b2-08d7dd53ba82 X-MS-TrafficTypeDiagnostic: MN2PR11MB4398: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-Forefront-PRVS: 0369E8196C 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)(366004)(346002)(396003)(136003)(39850400004)(376002)(107886003)(81156014)(54906003)(8676002)(86362001)(1076003)(6666004)(8936002)(4326008)(52116002)(66574012)(7696005)(316002)(66556008)(66946007)(186003)(478600001)(2906002)(6486002)(2616005)(66476007)(16526019)(5660300002)(36756003); 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: AFYy6hQPlA3VIDCRL/GOZpCw0tOMIKwHVOLuzVMsW8oCQNQDBh0e37Zw/i0mNv/uXWHPoW9Ay6U7u8pXGMLlxlYTWcGudqKY87J0Nii5MEf4UAqKE6uDQnMoJzegtwF401TrHmRxPLP4SW5bOIUdDKXV2ov0wLHMhtLGoSYNfTSC6C8bnyK8jmEQK+evaCbNpj3GCeg8LU205ZOjhRuhM7GFmCS+mYerpxnDE7LjND+OvcEAMedx4w/Oakt+e/zVjd/Vj/CMwX7vIfBacbsDHlgxmVWtapbvp6fhjbfnpMEdm/hACcv7/w4gLMsuhBV7MMTMi7LZq4ORista8Buy8jTAjsEn/weLV1tOGjZXPOvNxYzr3kw3xDZTgB/cehJj55Cx/oiuIYDWVhNI5N3mJOMBRAs+FojQBGF6kvAOq1WQU4OrtVs4JK0+9dRsXRbs X-MS-Exchange-AntiSpam-MessageData: 48AbuPnTdC91xtTP9CDaHnfM18A1W8IYZ09GSsse3Vgto+mfH7usELVFtBttbIkKKYh43QeovXKSm2ZErdkUblqGHe8/ZcZ9bYgHTrpSONXON/cSjwX0mMvN88ueaq6veIJQMx+cWCET5rZ9My0zswl2Bm4IfPauEjlJqzrrYqCleQjksCq07BOHVT5HB5xkZSKQQcUB/b60/mEzsph3dQ== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 900041d9-e2ef-4dac-68b2-08d7dd53ba82 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2020 13:33:18.0515 (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: gCuMVRCn0dlqk9cd3Me4AVnTcc7fOimLmHU72kizjeOP56Fm3rjp0bbwkdgVstbEYYC+dpIwtBBiqJJo+KnttQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4398 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller In former code, wfx_upload_ap_templates() was called in more cases than necessary. Therefore, it tried to not update the frame templates if it was not necessary. Now, wfx_upload_ap_templates() is called only if mac80211 asked to update the templates. In add, it does not hurt to upload template if they are not used. So, remove unnecessary conditions at beginning of wfx_upload_ap_templates() Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/sta.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index b0557dab91fd..7af7bfa4ac99 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -570,11 +570,6 @@ static int wfx_upload_ap_templates(struct wfx_vif *wvif) { struct sk_buff *skb; - if (wvif->vif->type == NL80211_IFTYPE_STATION || - wvif->vif->type == NL80211_IFTYPE_MONITOR || - wvif->vif->type == NL80211_IFTYPE_UNSPECIFIED) - return 0; - skb = ieee80211_beacon_get(wvif->wdev->hw, wvif->vif); if (!skb) return -ENOMEM;