From patchwork Mon Apr 20 16:02:58 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: 1273543 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=IKrq8beu; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 495Wjm4BCjz9sT0 for ; Tue, 21 Apr 2020 02:04:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729764AbgDTQEU (ORCPT ); Mon, 20 Apr 2020 12:04:20 -0400 Received: from mail-dm6nam10on2078.outbound.protection.outlook.com ([40.107.93.78]:42592 "EHLO NAM10-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727920AbgDTQER (ORCPT ); Mon, 20 Apr 2020 12:04:17 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PZ5vUgrUldN8fiZncsSU1r/HoDKjE5VyKKEQyp2jC8JQ8T6GLkRKUWjYUrCnmvRhDOSuBnp3OxBFaMYiTRquX5m/MBE4rIt+SrIB7vfhLwo5MmvZNn9jvJNKaTrl+Kgg3kD6wFdPP3eBYb3kN+8l3r2MZ4ZD0TKuElwvknaIysg2rY2SBmqopX8gyEIvJqiMuNYfUULsQHw1RCcekYdymUfTvbLwLnoHllwQEC20MjBTIMt2PdwSjqtVjFmyesSriOKmv7ZM11Bp4+mTs8hqOxNEoopxScFeYGbyMEl8266tUFUyUk9CcZ1ofZDrNiHV2C+fl6N6OP/77KspXbtA1Q== 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=DJ/Ej4m1vIl/mpXVcyvZcEkqsdUqm5hoblIo2TO5OSY=; b=Ipb1+s5+wSAPGQZ+5pjxqBLc5tVzOCckSW+JvU9acjIZn147vp+WOCjuGrCIb8NfSxDFQDbBwth7DB5yp6SY7cgwrsJtFYJiVCt3l0CpJr7e1ehiggaGOlj0H14tBSEAcgnAaiC08v3LA1thQn/spyaPz7FH/Dm2P45SA6SBnGr8bWmDuRhJsgKn1FFFa1CuhXc6SXJJP3dmTvCPAn8TNfv0a0E+2ZcXYiUlC46gg5+hgERGHeet2QhBoORvpLL3TqU8mF1nbgQnPcC8U33JxOaqXw0BB9o3UaOSDmWuJfLT3ZNeI7Kdy5+lu8h7ydj3GS+RYQmbsPUgwOYIim5U+Q== 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=DJ/Ej4m1vIl/mpXVcyvZcEkqsdUqm5hoblIo2TO5OSY=; b=IKrq8beuVkFSJK23WoqopFOsOkwX3Ztfgn6T8IWVSvvhBE6xKgsOe+uu+ahgRzYp8x0tRVWU4UxdeesNZNCrH4K7GVNvsdSSjs3AEu2m6xkm/pDL4H3bRCKNVBLduEujpEJi3O+MzJKG+cuqSQkJoWPzn2Cn0TSzFKBoahPWV4E= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; Received: from MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1792.namprd11.prod.outlook.com (2603:10b6:300:10b::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.29; Mon, 20 Apr 2020 16:03:34 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::81d5:b62b:3770:ffbe%10]) with mapi id 15.20.2921.030; Mon, 20 Apr 2020 16:03:34 +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 03/16] staging: wfx: drop useless attribute 'bss_params' Date: Mon, 20 Apr 2020 18:02:58 +0200 Message-Id: <20200420160311.57323-4-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420160311.57323-1-Jerome.Pouiller@silabs.com> References: <20200420160311.57323-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: DM6PR07CA0065.namprd07.prod.outlook.com (2603:10b6:5:74::42) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.silabs.com (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by DM6PR07CA0065.namprd07.prod.outlook.com (2603:10b6:5:74::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.26 via Frontend Transport; Mon, 20 Apr 2020 16:03:32 +0000 X-Mailer: git-send-email 2.26.1 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dc4af28a-7637-4bf0-668a-08d7e54460e3 X-MS-TrafficTypeDiagnostic: MWHPR11MB1792: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-Forefront-PRVS: 03793408BA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1775.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(10009020)(39850400004)(346002)(376002)(366004)(396003)(136003)(66476007)(66556008)(186003)(66946007)(4326008)(86362001)(16526019)(107886003)(6666004)(81156014)(7696005)(478600001)(52116002)(8676002)(66574012)(54906003)(316002)(6486002)(1076003)(2616005)(36756003)(8936002)(5660300002)(2906002);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: TlBon4EJdeYyK7cjbd1ggKW0+0aUU7jU3nEKI+3PdO6Ih28ks0ko9MAfSgGGoogW31WU3yCZAfP1dftsWF7udmqBtmfvjV10dlmuoDqi5CFXTx7Q6jgVBljquccam0nJeEXlKLEkZnkwuCa8gErDIIOT+eqy7pwy4VBQlct9AKW1IDS77hph3rJ4TZW0f7H2jAfP1f6p2P07RuPisXnhe17BaTcJEPbf+q3AcIpf9JQFjevXKEYXT+z8a8cga9joSYrmZ1FoiSt2HGaPHgjLymuUINyArRSqf1K5YSBW0ZBH3U1bs8wzIYgb3N5bYG18MHaRq1SFP/PhuLkcmoePTcQQHYIrtVCXAFt1dNVvRephjnfRxq0GamvdHw5SQzIrOXt2FlFNqgU7QJNAWpk+O30YGTjK33YDfU80y9qNxJX2Adcwl1eSt/RGecw5Fpwj X-MS-Exchange-AntiSpam-MessageData: kIyb/OzdFxoau20xdAbUwmVBgkgWJflpEN0Wl88mQ9e3RGmgmNfbOogDR/5BJhpEztasbz6j1yLjLeP9CH6or1crCjObJ44bPj9Ib/ttra807dhtHLsUKH1EXOpqfq/zjHpjAJG/zVgulNobq6QIaH4wFwbkFukCguD09lJp9TjkQDRwGcRnr/DpZOx7xU5beeo3CvJ38nL/TSvJHwVrSzTXtSQOe/Udxd2YviNn5wMvjgn2A7Zgc588Um7RvfqiPd+NfpzNu+gNzNthykrCxw7otdJ7rT0aBjwlb6ys1ZZNfkwwYX6fma/9A9NcocJ09j5rpAfux3mAqZ4hAIQt1zGTprwWb7HxjS/4ZxG8YrhySKjRYgj7L+jhfhoLnRrB4OCPBa5JohljqyDRZt01SWPRKTTfnbnPyxKCwn6Vhqu57J0Pd2LNhxCk1rKBHPcEodCPpz1okYk/QYOT2kHxDE2F8X1kb9KWVfn7R5k1HAFbM08ezt7/3fBTWt+1b74QZYIgXXM+KY4rWqEFJSGnGbxv/2lo5LcI5X+S3MwNrBgOCPIT78Fej4yBfQN9BQR9IOgj+9g4nWmWw+GSFZbue9U3Rh8q69JbUTLfSu7SR0DPBX8YD4UECbY3qfH9UrMFDKVNXRZlFGtk1Fn74fGy+93EVj+Uof4PjgczRZFfI/eerSAAyjnqwcTwWMTRdJ9O8KHXkkqr3FaPp/wnevmHfWVaoooz3x8Wj/QfMU5HuZAhNkf4+Q3RNc4BvEtI9BgwL96DjyBfrrOSC7y2L9BSdPXcWGFvp9KpgSHmaNNVWN8Nltqim0AbXT/aQlpk0aAsWtZWwHkoY1rTotIoyt7mZTS74zEl7F2CoQEOb/5dyX8= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc4af28a-7637-4bf0-668a-08d7e54460e3 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2020 16:03:34.5755 (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: Y/HsCdRYN6tyEAeEeXNCIC/FBzVYO/fclLpjgKnYNBmkoVtCXGRKn3IDa8/B8/BYUblIdgMbSHXKahjm7GXRNw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1792 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller Since wfx_bss_params_work() does not exist anymore, there is no more reason to keep a copy of bss_params in struct wfx_dev. A local instance in wfx_join_finalize() is sufficient. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/sta.c | 14 ++++++-------- drivers/staging/wfx/wfx.h | 1 - 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index ca84724e531c..2253ec2bdbf3 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -354,7 +354,6 @@ static void wfx_do_unjoin(struct wfx_vif *wvif) wfx_free_event_queue(wvif); cancel_work_sync(&wvif->event_handler_work); - memset(&wvif->bss_params, 0, sizeof(wvif->bss_params)); wfx_tx_unlock(wvif->wdev); cancel_delayed_work_sync(&wvif->beacon_loss_work); } @@ -534,15 +533,16 @@ static void wfx_join_finalize(struct wfx_vif *wvif, struct ieee80211_bss_conf *info) { struct ieee80211_sta *sta = NULL; + struct hif_req_set_bss_params bss_params = { }; rcu_read_lock(); // protect sta if (info->bssid && !info->ibss_joined) sta = ieee80211_find_sta(wvif->vif, info->bssid); if (sta) - wvif->bss_params.operational_rate_set = + bss_params.operational_rate_set = wfx_rate_mask_to_hw(wvif->wdev, sta->supp_rates[wvif->channel->band]); else - wvif->bss_params.operational_rate_set = -1; + bss_params.operational_rate_set = -1; rcu_read_unlock(); if (sta && info->ht_operation_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT) @@ -552,15 +552,15 @@ static void wfx_join_finalize(struct wfx_vif *wvif, // beacon_loss_count is defined to 7 in net/mac80211/mlme.c. Let's use // the same value. - wvif->bss_params.beacon_lost_count = 7; - wvif->bss_params.aid = info->aid; + bss_params.beacon_lost_count = 7; + bss_params.aid = info->aid; hif_set_association_mode(wvif, info); if (!info->ibss_joined) { wvif->state = WFX_STATE_STA; hif_keep_alive_period(wvif, 0); - hif_set_bss_params(wvif, &wvif->bss_params); + hif_set_bss_params(wvif, &bss_params); hif_set_beacon_wakeup_period(wvif, 1, 1); wfx_update_pm(wvif); } @@ -841,8 +841,6 @@ int wfx_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) INIT_WORK(&wvif->update_tim_work, wfx_update_tim_work); INIT_DELAYED_WORK(&wvif->beacon_loss_work, wfx_beacon_loss_work); - memset(&wvif->bss_params, 0, sizeof(wvif->bss_params)); - wvif->wep_default_key_id = -1; INIT_WORK(&wvif->wep_key_work, wfx_wep_key_work); diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h index 2747c7cdf4d1..5484e7c64c3c 100644 --- a/drivers/staging/wfx/wfx.h +++ b/drivers/staging/wfx/wfx.h @@ -87,7 +87,6 @@ struct wfx_vif { u8 filter_mcast_addr[8][ETH_ALEN]; unsigned long uapsd_mask; - struct hif_req_set_bss_params bss_params; int join_complete_status;