From patchwork Mon Apr 20 16:02:59 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: 215911 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=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 D1C46C3A5A0 for ; Mon, 20 Apr 2020 16:05:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A8F2B2078E for ; Mon, 20 Apr 2020 16:05:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="NJFlOeC1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729969AbgDTQFV (ORCPT ); Mon, 20 Apr 2020 12:05:21 -0400 Received: from mail-mw2nam10on2061.outbound.protection.outlook.com ([40.107.94.61]:6055 "EHLO NAM10-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727913AbgDTQDk (ORCPT ); Mon, 20 Apr 2020 12:03:40 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fM9T+kjmFfjsNZFmkpef8NEKC07aoPShtinvYCnU6g1U1nCePLYow/9DeAGQGZcDNcrtUscZE/ATrJpJ5chG9wt8E+/D//AYJkBpsSOBaNwn5pV2plfvUyb8TUIq5jND2G+y30iY/b1TiDzA8asxonFwFzd7AiCHGOOh+ZioWvQgCWXVlHbyf0KZRwd5SdmBdDo+FhJJCtjE9KaqxsuA/wG/qXpF9wDCWq/v5iQN7NxOxR/+hm/2c/kOAmOXvRn/Bo3Nz3blt0Ryt0/2bx0i75fpL0KdJOwW4t7tyt2dRfnldlXzfvZ9NJoGnhWbtV+x2TT5YNgG0gZLd6VfWtXnWw== 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=CIIn5gYo1S799Alx1I75/HyBqK+b319EaTF5oWsSuvE=; b=WKvvGxAs4iQu0jS4lEOsOR4Tu4DCma//eajwSnrgQ/NDlDNaWOp+pYjxweQl7P9evZ7NBVTHPzdjN9qPySG4oHFiLg6/T+hYkEvWcOtB6A4/wlHj7qHGTuSmlxFpyF48ijv3kItPZqsP8nHLPGfzlrtrV/ROT8tRUM7T3eokzafKLq8jVTknyK4USUV7lf2fE9QrGHK4G6MZY8++XK7iE6ga+KdWJ/Ns987G8L2eZ87w0kE3MSz12Ov9FZfxXNNnVFKHSY6kFLdQIddd/8iy9hAN2IkBxLEH+UX9xTJIGA5xgxmH3sbDn6pyun4GxCiELHg1AsPnn07MrlbwwJfEAQ== 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=CIIn5gYo1S799Alx1I75/HyBqK+b319EaTF5oWsSuvE=; b=NJFlOeC1oX9Mg/yb5+lj/DypON1j4q/xNV38KGRGzTVI5emoyW0KAUX7OkmY/42wW9kC7b6VVKwTV53vK+nC32p+jTnMNrWkuHz87EGxDM/54KeuSX8OpiYfson5uZJ1AyqkRwPiXIQ0kbegoMt7FQi766c4hxqUVGuy8gYPPtM= 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 MWHSPR00MB249.namprd11.prod.outlook.com (2603:10b6:300:68::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25; Mon, 20 Apr 2020 16:03:36 +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:36 +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 04/16] staging: wfx: handle firmware events synchronously Date: Mon, 20 Apr 2020 18:02:59 +0200 Message-Id: <20200420160311.57323-5-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:34 +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: f8861646-f92a-4d90-24d2-08d7e544622d X-MS-TrafficTypeDiagnostic: MWHSPR00MB249: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2958; 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)(136003)(366004)(376002)(396003)(39850400004)(346002)(8676002)(7696005)(52116002)(6666004)(4326008)(8936002)(81156014)(66556008)(66476007)(66946007)(36756003)(186003)(54906003)(16526019)(107886003)(478600001)(2906002)(316002)(66574012)(1076003)(86362001)(6486002)(2616005)(5660300002); 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: YaGM8pVWOxodsGmkdMrwGD2HipmWxdbbexGUzeIEodp8wEmVriCJH/tWdc10ZrBTJvyjd1ge7eYik1eOe5TApQByj7qkgjQOW6Uz/WVfxfy2Iw0voRMdN21HX5wjLuXRKG7hMmwdoQlnpU6DVEfhYR+i75xHM7oDTgGEBYjbRUua3zxdikfWZjbQO2mnUmVSV5XBJNlsCqC0iCKfMePfujZw15na7gbw67fJYLQTDFKQAENLtAd0l8EdI5Ie1Ad/AywIDV4lwmQLw+cd162vqr5y33c36tHDpLBScvxwfs+dH1wiAVVC+Z9N4ZacvX7itUVANmzajJP7htHFFvdyWWl6NzdWNW/5KjZe2ENQKf5xKliQ+JI+zkACdXuMBHAGSPf1Ei9c9KhB0+bJowJtbuxIVDvyFuOhihsNwukX41Tzw7hESUdgdWreLsMT99vv X-MS-Exchange-AntiSpam-MessageData: MmPoeFnbIsY3torCWje4nyQFOkdwKvRKY0+ncTQd1OGHgma35CEcS/KjTkWcQWne8mpHdmTltxEBkHC8Gpge2X0YaPA9TQ1K5mtmw/iPSLlaTMxY+QzR2mWefI/BPxq/gJPGwn6xaou7aW9EHOEG4/H01Kh1WJ/5hofcmCwLjPtHoZdYPi2bh1ZAHRGsCnMBr7vfD2fJJQHS6aJfsi2AeWi3Z+D5shHP5JfGHHQkz7iKsExf8TiZBUxmvDIuhswltGnr+xuOxtdm+TYu0fmxKtpjHhKdOh0wIW/WWaVeUt6jbS7yv+IfzJy5/r+yCnJyYahh6GEMKwBmzXh/y5o1z8UtRS4He6++SziJn+Irq3sbxUQA0k1NJrkCSg56PLCtmy6ymnn4DNDeGl865ecV2QiYNkNpnYJEpZGEkKaFUr0VFRmcFCLranzFCaLH1MaMQXuaaJQkK/iA4tSjLtv2FJ2CIwBgkgeMDSeF2ibWkbDDRvXU3zxXj6w9fxlGSqiKPV5xPs6vU67n1DjeJst7n1zg3RejHjhD5dS8H9QcUqs/3/U9Yku/Wjdnye7v0YHEKvb1id2ueFvr3xFWN51u0tksIGvoYaZ6t//CBQp2WV7Ua58Gk0617umYYTaYNLSxtrs7pk+VyF8AKP+zV916YOpt3BprhA0jKmUDtWXIoMTgrPqSyTwE/4dyotv6FXgiqgAUcLArQg7K7NuxNXjF0UE5D7uvwPmaQKNgJpUg18jQabRUczq0ZvkHuY5gf2WrujJdmioifXqViIQE+9y3EdYWEZb/VMpyqAnmdf841IWIUVXTOYSwyH2dCFGIey8FNfC/hQOUlUoHIU9Qn0XxYAdL6w+bt5WZoUyN0c17lyA= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: f8861646-f92a-4d90-24d2-08d7e544622d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2020 16:03:36.7285 (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: s9gJBSYMaeYAJQKgVLAOl80YyRVxFcrvBxeWhxX5JXPIKDC5Eai5yJhmCY56uf2FJzwLsSKxBAhXxn71XCIWEg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHSPR00MB249 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller Currently, events from firmware are handled in a work queue with a complex event queue mechanism. It is probably overkill since there is only two events to handle: bss_loss and CQM events. Handling these events synchronously is sufficient. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/hif_rx.c | 39 +++++++++++--------- drivers/staging/wfx/sta.c | 70 +----------------------------------- drivers/staging/wfx/sta.h | 6 +--- drivers/staging/wfx/wfx.h | 4 --- 4 files changed, 24 insertions(+), 95 deletions(-) diff --git a/drivers/staging/wfx/hif_rx.c b/drivers/staging/wfx/hif_rx.c index 33c22c5d629d..b8d570256498 100644 --- a/drivers/staging/wfx/hif_rx.c +++ b/drivers/staging/wfx/hif_rx.c @@ -158,26 +158,31 @@ static int hif_event_indication(struct wfx_dev *wdev, { struct wfx_vif *wvif = wdev_to_wvif(wdev, hif->interface); const struct hif_ind_event *body = buf; - struct wfx_hif_event *event; - int first; - WARN_ON(!wvif); - if (!wvif) + if (!wvif) { + dev_warn(wdev->dev, "received event for non-existent vif\n"); return 0; + } - event = kzalloc(sizeof(*event), GFP_KERNEL); - if (!event) - return -ENOMEM; - - memcpy(&event->evt, body, sizeof(struct hif_ind_event)); - spin_lock(&wvif->event_queue_lock); - first = list_empty(&wvif->event_queue); - list_add_tail(&event->link, &wvif->event_queue); - spin_unlock(&wvif->event_queue_lock); - - if (first) - schedule_work(&wvif->event_handler_work); - + switch (body->event_id) { + case HIF_EVENT_IND_RCPI_RSSI: + wfx_event_report_rssi(wvif, body->event_data.rcpi_rssi); + break; + case HIF_EVENT_IND_BSSLOST: + schedule_delayed_work(&wvif->beacon_loss_work, 0); + break; + case HIF_EVENT_IND_BSSREGAINED: + cancel_delayed_work(&wvif->beacon_loss_work); + dev_dbg(wdev->dev, "ignore BSSREGAINED indication\n"); + break; + case HIF_EVENT_IND_PS_MODE_ERROR: + dev_warn(wdev->dev, "error while processing power save request\n"); + break; + default: + dev_warn(wdev->dev, "unhandled event indication: %.2x\n", + body->event_id); + break; + } return 0; } diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index 2253ec2bdbf3..a0c841658a0b 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -38,27 +38,6 @@ u32 wfx_rate_mask_to_hw(struct wfx_dev *wdev, u32 rates) return ret; } -static void __wfx_free_event_queue(struct list_head *list) -{ - struct wfx_hif_event *event, *tmp; - - list_for_each_entry_safe(event, tmp, list, link) { - list_del(&event->link); - kfree(event); - } -} - -static void wfx_free_event_queue(struct wfx_vif *wvif) -{ - LIST_HEAD(list); - - spin_lock(&wvif->event_queue_lock); - list_splice_init(&wvif->event_queue, &list); - spin_unlock(&wvif->event_queue_lock); - - __wfx_free_event_queue(&list); -} - static void wfx_filter_beacon(struct wfx_vif *wvif, bool filter_beacon) { const struct hif_ie_table_entry filter_ies[] = { @@ -269,7 +248,7 @@ int wfx_set_rts_threshold(struct ieee80211_hw *hw, u32 value) /* WSM callbacks */ -static void wfx_event_report_rssi(struct wfx_vif *wvif, u8 raw_rcpi_rssi) +void wfx_event_report_rssi(struct wfx_vif *wvif, u8 raw_rcpi_rssi) { /* RSSI: signed Q8.0, RCPI: unsigned Q7.1 * RSSI = RCPI / 2 - 110 @@ -296,44 +275,6 @@ static void wfx_beacon_loss_work(struct work_struct *work) msecs_to_jiffies(bss_conf->beacon_int)); } -static void wfx_event_handler_work(struct work_struct *work) -{ - struct wfx_vif *wvif = - container_of(work, struct wfx_vif, event_handler_work); - struct wfx_hif_event *event; - - LIST_HEAD(list); - - spin_lock(&wvif->event_queue_lock); - list_splice_init(&wvif->event_queue, &list); - spin_unlock(&wvif->event_queue_lock); - - list_for_each_entry(event, &list, link) { - switch (event->evt.event_id) { - case HIF_EVENT_IND_BSSLOST: - schedule_delayed_work(&wvif->beacon_loss_work, 0); - break; - case HIF_EVENT_IND_BSSREGAINED: - cancel_delayed_work(&wvif->beacon_loss_work); - break; - case HIF_EVENT_IND_RCPI_RSSI: - wfx_event_report_rssi(wvif, - event->evt.event_data.rcpi_rssi); - break; - case HIF_EVENT_IND_PS_MODE_ERROR: - dev_warn(wvif->wdev->dev, - "error while processing power save request\n"); - break; - default: - dev_warn(wvif->wdev->dev, - "unhandled event indication: %.2x\n", - event->evt.event_id); - break; - } - } - __wfx_free_event_queue(&list); -} - // Call it with wdev->conf_mutex locked static void wfx_do_unjoin(struct wfx_vif *wvif) { @@ -351,9 +292,6 @@ static void wfx_do_unjoin(struct wfx_vif *wvif) wfx_tx_policy_init(wvif); if (wvif_count(wvif->wdev) <= 1) hif_set_block_ack_policy(wvif, 0xFF, 0xFF); - wfx_free_event_queue(wvif); - cancel_work_sync(&wvif->event_handler_work); - wfx_tx_unlock(wvif->wdev); cancel_delayed_work_sync(&wvif->beacon_loss_work); } @@ -844,10 +782,6 @@ int wfx_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) wvif->wep_default_key_id = -1; INIT_WORK(&wvif->wep_key_work, wfx_wep_key_work); - spin_lock_init(&wvif->event_queue_lock); - INIT_LIST_HEAD(&wvif->event_queue); - INIT_WORK(&wvif->event_handler_work, wfx_event_handler_work); - init_completion(&wvif->set_pm_mode_complete); complete(&wvif->set_pm_mode_complete); INIT_WORK(&wvif->tx_policy_upload_work, wfx_tx_policy_upload_work); @@ -904,9 +838,7 @@ void wfx_remove_interface(struct ieee80211_hw *hw, /* FIXME: In add to reset MAC address, try to reset interface */ hif_set_macaddr(wvif, NULL); - wfx_free_event_queue(wvif); cancel_delayed_work_sync(&wvif->beacon_loss_work); - wdev->vif[wvif->id] = NULL; wvif->vif = NULL; diff --git a/drivers/staging/wfx/sta.h b/drivers/staging/wfx/sta.h index 6d7734c65902..767b794fa398 100644 --- a/drivers/staging/wfx/sta.h +++ b/drivers/staging/wfx/sta.h @@ -23,11 +23,6 @@ enum wfx_state { WFX_STATE_AP, }; -struct wfx_hif_event { - struct list_head link; - struct hif_ind_event evt; -}; - struct wfx_sta_priv { int link_id; int vif_id; @@ -79,6 +74,7 @@ void wfx_unassign_vif_chanctx(struct ieee80211_hw *hw, // WSM Callbacks void wfx_suspend_resume_mc(struct wfx_vif *wvif, enum sta_notify_cmd cmd); +void wfx_event_report_rssi(struct wfx_vif *wvif, u8 raw_rcpi_rssi); // Other Helpers u32 wfx_rate_mask_to_hw(struct wfx_dev *wdev, u32 rates); diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h index 5484e7c64c3c..913b80d024a3 100644 --- a/drivers/staging/wfx/wfx.h +++ b/drivers/staging/wfx/wfx.h @@ -98,10 +98,6 @@ struct wfx_vif { struct ieee80211_scan_request *scan_req; struct completion set_pm_mode_complete; - - struct list_head event_queue; - spinlock_t event_queue_lock; - struct work_struct event_handler_work; }; static inline struct wfx_vif *wdev_to_wvif(struct wfx_dev *wdev, int vif_id) From patchwork Mon Apr 20 16:03:00 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: 215918 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 D3AB7C54FCB for ; Mon, 20 Apr 2020 16:03:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A5AEA2078E for ; Mon, 20 Apr 2020 16:03:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="pq9Dki7M" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728948AbgDTQDr (ORCPT ); Mon, 20 Apr 2020 12:03:47 -0400 Received: from mail-mw2nam10on2061.outbound.protection.outlook.com ([40.107.94.61]:6055 "EHLO NAM10-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728279AbgDTQDm (ORCPT ); Mon, 20 Apr 2020 12:03:42 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fwori2fQYLL3zoM2/UWYe/QQ3H6+bfCmk7dVMMwEe/WWfee9Fs6xFxpSJc3l7YlI+vamZaKhqaYrnf3R9epIj3vw8rp90wvVB2YeJRV6wdC5T4H71c+wYvDHBid4gwVaNsZpS/vq5WTS5n+nbWJGncnmmyLcSSKr+G6HEUkQjYw03zouL1zLUkRI0CMWsoxCERYCxwhpgc1czFVo3Or4jdTo5Uvyg34YW2ca/0sbyoQvzedO5P9rZ5HZsnMjmlSIuw+8lXswMZg0wg4KHZc4heZDRTnNjWJhTrlExqDHPhNjRG85LAbzISUzuzTgwaCEP594rg8f46llNm9WC0+xug== 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=XriGrlSX95bXHZj40QDpDZgOB9/D/eBvV6rjUtBDCyc=; b=G6A2PY5skh0JqIgZ1tlCBqcjN/jQLrVNZZR3gPXTbIsAKBYRwzv5NFbRh7PSzCBhK7fp4huGCINqBq9moxjtNWSFcSzDOCqcCeeSUdR2dmH7EyQQ5hr5DVwhq0SgX6kbQJalb2vrr/SYW+bp0qBknGBE3xkmq80gBSEYZ4mCnkw6ysyS4qG3/mZjienwQzOnQYr8rW3w3tBBNzwnv4J/B2KWjKzG86LbqDVZm6LhnIqTmq6y9UiSW9wEcafUJAsv6JyxGCGbAebYe+t1717LKhixdDqyFRogo8AesgTnJ/h+VaVHZ/HgFCV5HNgmUtp6d0wTKmvo2dCf6VEH00/oOw== 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=XriGrlSX95bXHZj40QDpDZgOB9/D/eBvV6rjUtBDCyc=; b=pq9Dki7MDumTXMqQSb4/9tdqv6g14Ml6ak4/mCPsi/WDhl3aexAemkXmrrzKXBOBsW4Quzo9epYs6xdMpGzQrCUvg/Jnfi8Vtpj5CAm9n0U31Mtrxq5Bouc2pyQGKLBfL1kSMqNMDAyzAeR1QnF9uGURXfYEpjy30qCSiFed61k= 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 MWHSPR00MB249.namprd11.prod.outlook.com (2603:10b6:300:68::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25; Mon, 20 Apr 2020 16:03:39 +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:39 +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 05/16] staging: wfx: also fix network parameters for IBSS networks Date: Mon, 20 Apr 2020 18:03:00 +0200 Message-Id: <20200420160311.57323-6-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:36 +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: f9b80fd4-3510-4aa8-e25f-08d7e5446388 X-MS-TrafficTypeDiagnostic: MWHSPR00MB249: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; 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)(136003)(366004)(376002)(396003)(39850400004)(346002)(8676002)(7696005)(52116002)(6666004)(4326008)(8936002)(81156014)(66556008)(66476007)(66946007)(36756003)(186003)(54906003)(16526019)(107886003)(478600001)(2906002)(316002)(66574012)(1076003)(86362001)(6486002)(2616005)(5660300002); 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: 9GJBJTLQPjjmXmefPgq03BEeSWWhzHP0D/kF5YP/UEFLEaet0XwaOlSJ6uaCp0yRG0fKU9mbxdAUkbexg0pijfi8kt9NGonGCB6tqCaFn8gUIV0DaC65rx8rM71L2MhvvEUoUfA0CexvYS+zaqG45zfBCgRq5Cl+i+uS+W5YPI5aw2ncAgwUPwtb4K1BzYgcIDawn+7DjO/ABt6g/MIEW0kH0V8GJPqlM2YKtG8pVlvi16XEaM7xNX3xfPFFCi/UjXYtvf92mvkQP/74uF5Q+t9zREPAJIlyPxTiOW1VJgqwdU7Ts+ZVL5w9G1HiMlgELZvg4LCU3KDDvHdoVeDM1DJvGt2OG7tyT4SQM5QOzQarb0bMtVJ5mggqueNAVJ5blH4hVyySljGRylDWYHjxaL4+NHNST418CQ+0EiiMbmKlG0d6ZWBEyZB6Ihc/31Aj X-MS-Exchange-AntiSpam-MessageData: QtAArj4mOJ32biQWs4ZSVQltKg9U9i0E51TGCIoKXvl4g5tVOCNChTO/+RhZqFBHz96CXFxxNIQwx0/Uam2LzEQhXIZvIRLgh0STpaO8VTTgm4rSokjMNsHYwQwejY7Pe/gsOe52NYOCU5L0LYiX9E625glyWzZv7JNsz092OPsbA3O3321TtibAbwt492dbA7ZGzNQYHIGrVY1dQUrDFX5GfegY/RnPjTlSBekv9XPjBSVEXdd7RpoFPeJohn1XwazREAWoUzE544ieRbH2pWLa65XLMyozuoEY2J5V7I+cC/BYTYv/QsPJify4fgto7tuSFFVjgfF0S5iPSgaBdAJDHZadpnMlYRv6hh86JYqI8bQZO36UQXF2qlpTji0bAUqucUtSaCUZ+RXrVni+3s7jMy9qh011mTqIdOaF7ZyZOHis2xyAHWSpoh+X9E7vbtYShkYM7+oCSB4GkfpKgZh513hjMb54WFTFTGlrKkScOAi+8PPyGqrRhDVQjJtfAzAXGgXQB6seVkgPt+qGzwRtm2YfETrorpYMNfduSVjK3AtWZOyiuW26DfFoywr/Szj4pxSpeLJiTLvNKmFQPriKobZn51ABtoyVYePQGX45hN+RDFqZVHSlD+rTNMy6Z5dpoyuMffwRZS7xlVPskyMyzrk6GtWY5G7+Vdc/PM2WFrVsnHwoCkuL9ix0OcQO+Ul+JW/f+LJWu4Uv67guoLNe/DQKgqVuve0h8YU5JsZguSxUKD86UPjdkt+xyJ/QwMcioIem4rEUM19h8qcy99gQtI0km4LhvdXZ9NuvZoHtkYLVgAJpMqaxxWQdE6bNrpVoX1SQJUJzMhdz3x66mu20YXrbgghJLQoZAYVrNHk= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9b80fd4-3510-4aa8-e25f-08d7e5446388 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2020 16:03:39.0164 (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: 2/noBMPFCBa1HRG1FQzUtd4DJclCDohta1CGHVtkEGmoxCzROQ/VO5JExQOzrXun4vT40CtKZah4RjqxZ0ry3w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHSPR00MB249 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller Current code skip some configuration during joining an IBSS network. Indeed, it seems that this configuration is not used in IBSS. However, it would be harmless to set them. In add, we would prefer to keep association processes for ad-hoc and managed networks the closest as possible. It also ensures the values of internal parameters of the firmware. Therefore, apply them unconditionally. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/sta.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index a0c841658a0b..a0c7737903b9 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -494,14 +494,13 @@ static void wfx_join_finalize(struct wfx_vif *wvif, bss_params.aid = info->aid; hif_set_association_mode(wvif, info); + hif_keep_alive_period(wvif, 0); + hif_set_bss_params(wvif, &bss_params); + hif_set_beacon_wakeup_period(wvif, 1, 1); + wfx_update_pm(wvif); - if (!info->ibss_joined) { + if (!info->ibss_joined) wvif->state = WFX_STATE_STA; - hif_keep_alive_period(wvif, 0); - hif_set_bss_params(wvif, &bss_params); - hif_set_beacon_wakeup_period(wvif, 1, 1); - wfx_update_pm(wvif); - } } int wfx_join_ibss(struct ieee80211_hw *hw, struct ieee80211_vif *vif) From patchwork Mon Apr 20 16:03:01 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: 215912 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=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 D037BC3A5A0 for ; Mon, 20 Apr 2020 16:05:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A6F572078E for ; Mon, 20 Apr 2020 16:05:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="FWti3igT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728861AbgDTQDq (ORCPT ); Mon, 20 Apr 2020 12:03:46 -0400 Received: from mail-mw2nam10on2061.outbound.protection.outlook.com ([40.107.94.61]:6055 "EHLO NAM10-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728691AbgDTQDp (ORCPT ); Mon, 20 Apr 2020 12:03:45 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WOQqRBfRsrObs25L4O5Rzjt9pH7C8sttgh561T9F7fIx6w7ry+7h9WWjweT98GSpGcF36ey0nME9/r0ktIbbm5pfFPGGhzeUgXyux+E52+fEMiQRcJ3EHPjOwA0KswlzPtI3OCCYoBhohJt/yMTB/22QOjFhJPTXUhESfqd6nQnSZ/SEyI+UAV36oDETT0MMP+NtigeRkRJPvSy9zaayXEDbaSir44Xk3ekFemr3lL/Yl/XKILrsGJOrvRqiPBBn8lytnIiwppGViE+WkaXRiqXUkTe6bil4BcWvsjYn7kcb7W8gOeI6hHm5quZzMQsQfq8JOrTQneKcYt7nUGujWg== 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=ggeuuNXuX9ydvLStcV/yrVHa8U5v9ZFTwIl4pzB4nzA=; b=k1eSbGA+IWsnTS/VE/k90Xzr3ExCSWMlmAbVokqd0WOyD7k5/IDwcx8LYdbeN//UmcFTKosfQPJ7ZCT8B5PzI9dT9d8rShm6IHYBfc/94EBToQrIzdCLVbnU5RUDyTLgfBgnlvL24gHnycPIjSTuXEuHNXPppkAtHeGKLLsgT8H/fJ+e+XPGx/gpXZN1oSmH3PLwNgkLPSNDGu9NlNtOXX+HB+NIgK2qZSMeURDHyaVJy5WZovsQuYq0Iis/g1TQ9yrYzXKPLQw0X8uhXMYH+iPA+4NEvSEIjwSByaX7oGmBrAbyfODLqZsTYAwAdt1hyNfTm8FlRSpODCIAufdmPQ== 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=ggeuuNXuX9ydvLStcV/yrVHa8U5v9ZFTwIl4pzB4nzA=; b=FWti3igTLlQ4xSRzMyj7ECDdxScSSp/k+nVKFDTsLS45TFtfRR6BwdwQgCNUczaZT6pIXNgAxJ/0veDExOtOXiVZtugfu8/Ng9n34UGWDF51p/IL+heuEvdzuefAKPGzLGn03bH0/QsZadjDCfl4kHGcwR3BqIMcdlzevDhUf3U= 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 MWHSPR00MB249.namprd11.prod.outlook.com (2603:10b6:300:68::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25; Mon, 20 Apr 2020 16:03:41 +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:41 +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 06/16] staging: wfx: dual CTS is never necessary Date: Mon, 20 Apr 2020 18:03:01 +0200 Message-Id: <20200420160311.57323-7-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:39 +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: f6c021c7-f708-47dc-e1e2-08d7e54464cf X-MS-TrafficTypeDiagnostic: MWHSPR00MB249: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; 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)(136003)(366004)(376002)(396003)(39850400004)(346002)(8676002)(7696005)(52116002)(6666004)(4326008)(8936002)(81156014)(66556008)(66476007)(66946007)(36756003)(186003)(54906003)(16526019)(107886003)(478600001)(2906002)(316002)(1076003)(86362001)(6486002)(2616005)(5660300002); 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: dCCnfp5OTejGxhE+qWut2jnsABbDXpF5Nr+SpFQeNKJ5PASjbwoKAWc6kbufikmzcg4s1rdDP0a4fy8G1Uu3DIqaB4ndWaT+ysX+2b6wGUv4uh75nRdhEOu6tG6tqXGv7+4MPCMpZx6qnCsjjWyA7h3bvsVynxx9NbCNwFNORKEF909O3AL5s4I2PxTWcgFtmKx4iBH3jrSizUzjpo3Gtu/R7JPBknIsD3jcWAqv1DnAeS1r9KyoQxN9a0D/K3hieTHOCBXcOti29jRd8arKiqUR9ChwrNoS8W/wsF38SbeC4A20GIG6jW1GeQDUSAj+DpwuFwjvXjTFYeSoD180lY1Uf3NqZ+vzh50s3T12ubDcj0gwyH0ME55hsUZZUBE7uUWERYa6HgC0hq/3lDKfnqBkteyvLYN/bHDTqx0Ax8xPrwy1fUBzm6m9UKowRGCu X-MS-Exchange-AntiSpam-MessageData: dgT1W6dZA+JHlq4l9ZTwreg+75A7a8Nwy8HWo/mQLzvZ9gMB/2LL0rqmvJ5xnyBuaY2NC2oFEjpzKBcaTtK6FLNHVeBP+ztD7xKFfQatl4sa7fbfmALO26tQOuEN4ocow2vWgF/iFzG8M1j9IiGXcGucBXucxvYTexdS9euqE1ql2uBOjv0+o8wM9AJCPskx0adiITa7OF0yngGb6/U8Lj7N04SoJ0MefYGYpIk+bfzBBdovMTwmLUxSxnHCbrCZIAek1bqs0NKsWF14+Po9h/GkVmV3gwiQ0NtYAK6MYny3ovXgFJRKJPYTCA+BvObsDUrrTUK3bzhzBrYwh18smRXnQYHRIsjLuoHGAugPKdMpb27G7ejeWEX75i6Z30pw2CbDkAotMEtCzE72uwTN2OslHo2v4wbXV26synTgwN8PtayqD6lhp1jytJYJwlGsn1oUeXImhvuqw3K7opk8wLSCSqt5oVDQDyoZ/pkRD+hBu3ERIducmi4Dkor2cOC/eYX5YcfuweXhH69sbdydsF57IlezLsLQw8Lni8RglLUi9m8JjgOXfPbJXXQdXRyca3wuFCyFfhkrLsZv9RUsAFfQ3ilYGDMFmK95r7Mb7pyFbx0N/Q6OP68qKVQ1XreXcvyfYlFVKI4x40h4Sb/vflTMi02Q+Vd3Fa3tJYsGTgthtiHpJW0wKa6fuQBUlYSi/kya1knQsPkatKiekbMKtptwbhv7nco7taVn5gLS+4N2ZXbDx7yyQxVMcasIFl8561i58JTmafxosXuXLxhcCDUAfO4wBE32KOzEcONB8kTEHxaaWySocdx7sr/ZxnpOStuHcDlrPQLoqOYjIzUdPdudf4iSG/9jSUdg9eGD6jY= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: f6c021c7-f708-47dc-e1e2-08d7e54464cf X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2020 16:03:41.1855 (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: y1Jz1KLkPQw7kyD7mDQl3KtAveI60M9yMNJUsoUEs1XiVZ5o8EFXBGQkT6jTrHWzosGL5oZafGTAUyFDUKDBBw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHSPR00MB249 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller Dual CTS is only necessary when sending/receiving STBC data. However, the chip does not support STBC, so it is never necessary to enable double CTS. We can simplify the code. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/hif_api_mib.h | 6 ------ drivers/staging/wfx/hif_tx_mib.c | 10 ---------- drivers/staging/wfx/hif_tx_mib.h | 1 - drivers/staging/wfx/sta.c | 6 ------ 4 files changed, 23 deletions(-) diff --git a/drivers/staging/wfx/hif_api_mib.h b/drivers/staging/wfx/hif_api_mib.h index 9f30cf503ad5..6f1434795fa8 100644 --- a/drivers/staging/wfx/hif_api_mib.h +++ b/drivers/staging/wfx/hif_api_mib.h @@ -379,12 +379,6 @@ struct hif_mib_protected_mgmt_policy { u8 reserved2[3]; } __packed; -struct hif_mib_set_ht_protection { - u8 dual_cts_prot:1; - u8 reserved1:7; - u8 reserved2[3]; -} __packed; - struct hif_mib_keep_alive_period { __le16 keep_alive_period; u8 reserved[2]; diff --git a/drivers/staging/wfx/hif_tx_mib.c b/drivers/staging/wfx/hif_tx_mib.c index 1d26d740bd0b..f04116ecb373 100644 --- a/drivers/staging/wfx/hif_tx_mib.c +++ b/drivers/staging/wfx/hif_tx_mib.c @@ -365,16 +365,6 @@ int hif_slot_time(struct wfx_vif *wvif, int val) &arg, sizeof(arg)); } -int hif_dual_cts_protection(struct wfx_vif *wvif, bool enable) -{ - struct hif_mib_set_ht_protection arg = { - .dual_cts_prot = enable, - }; - - return hif_write_mib(wvif->wdev, wvif->id, HIF_MIB_ID_SET_HT_PROTECTION, - &arg, sizeof(arg)); -} - int hif_wep_default_key_id(struct wfx_vif *wvif, int val) { struct hif_mib_wep_default_key_id arg = { diff --git a/drivers/staging/wfx/hif_tx_mib.h b/drivers/staging/wfx/hif_tx_mib.h index 0f8b3bd9f14e..bb7c104a03d8 100644 --- a/drivers/staging/wfx/hif_tx_mib.h +++ b/drivers/staging/wfx/hif_tx_mib.h @@ -52,7 +52,6 @@ int hif_use_multi_tx_conf(struct wfx_dev *wdev, bool enable); int hif_set_uapsd_info(struct wfx_vif *wvif, unsigned long val); int hif_erp_use_protection(struct wfx_vif *wvif, bool enable); int hif_slot_time(struct wfx_vif *wvif, int val); -int hif_dual_cts_protection(struct wfx_vif *wvif, bool enable); int hif_wep_default_key_id(struct wfx_vif *wvif, int val); int hif_rts_threshold(struct wfx_vif *wvif, int val); diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index a0c7737903b9..2a9c7f28d934 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -482,12 +482,6 @@ static void wfx_join_finalize(struct wfx_vif *wvif, else bss_params.operational_rate_set = -1; rcu_read_unlock(); - if (sta && - info->ht_operation_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT) - hif_dual_cts_protection(wvif, true); - else - hif_dual_cts_protection(wvif, false); - // beacon_loss_count is defined to 7 in net/mac80211/mlme.c. Let's use // the same value. bss_params.beacon_lost_count = 7; From patchwork Mon Apr 20 16:03:03 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: 215917 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=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 C36BAC54FD0 for ; Mon, 20 Apr 2020 16:04:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9C87420775 for ; Mon, 20 Apr 2020 16:04:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="emiCZB7Q" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729322AbgDTQDw (ORCPT ); Mon, 20 Apr 2020 12:03:52 -0400 Received: from mail-mw2nam10on2061.outbound.protection.outlook.com ([40.107.94.61]:6055 "EHLO NAM10-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729034AbgDTQDu (ORCPT ); Mon, 20 Apr 2020 12:03:50 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pu6rmvG9FngW2RMdYdVCT1tYOsax5Tb3irHutRrpqpk65hT29ZWp9vZs5SYo1QeqmPth5eeMXaSe9Yz7fG6NZnCB6FMkOVBDZTkOCjJoWHeP9X7G1OpP3YhFWJTbwfKkwXC4R7bO+iZlC8DM3o/A0pL7CheBj7JVJxQJEuRbKIImC8NjEExTCn3MsENK9Qc59u2wPEdf2gyZ7pokYi8SOxFdad0fDFkEmpXJyoiCQJC4cTGgOkD7KK9Qo5PfdM3c9b/SjIvN9pMvKfvHQKX1GrVBB1JOU0K1Q5JCIu/IJQdrBFac5IZeUt2FK1PcGzXRE7i5J8OBBt65HLFufHNaUA== 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=l70JogB9AaE6R6l9OLobf5gNGV2JilUclRV6+SgLLhM=; b=XPABDJ7nfioAaMokHF4JlQPBnUEiMYWO6j7XtGM9e9sjGj1Lf3gph6xRsHjWRCrhyGM4mR+Mbj+IhNDhrYrcpePg0pkJYgSoX9ekBrywLsylFCiUJLEjQGL0kcFr3JVSK4i0G2DMkiQSz44lfkxpGBnpagAPqxxwzJKjpWnqPagC0GddoOHApC+ex+IKp6fN4llIFC2ihyAXFKlazfDRMQ4unsl0qQ59pV3KgfDNHQlx8W8WmurX6ruaqVq2rMs8YdYHK6k9Jb+C93otkZ+U5wKyk1eiDXpUptz/ECs+QTrdsO3C28kAbX7TlOgofJBbogg+sRyqnjA6diS+hRx7nA== 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=l70JogB9AaE6R6l9OLobf5gNGV2JilUclRV6+SgLLhM=; b=emiCZB7Q8NVP/ZI2ycPpiaKnzzjcOgx1Tvj71BcYUS3R77r1jTGKNlcgx93YDU4Gh3RnpAXcnca1HLnDzPrHmAbXPXxZ59YtaGgEMugGj71xOlbSaW4OsvGOsdsg0vgm62iErpM26u67wajBQUYUml7OyhdqOBbCBfw6IBV+r1Q= 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 MWHSPR00MB249.namprd11.prod.outlook.com (2603:10b6:300:68::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25; Mon, 20 Apr 2020 16:03:45 +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:45 +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 08/16] staging: wfx: simplify hif_set_bss_params() Date: Mon, 20 Apr 2020 18:03:03 +0200 Message-Id: <20200420160311.57323-9-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:43 +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: b811b26b-b4bc-4264-25d8-08d7e544676b X-MS-TrafficTypeDiagnostic: MWHSPR00MB249: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3044; 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)(136003)(366004)(376002)(396003)(39850400004)(346002)(8676002)(7696005)(52116002)(6666004)(4326008)(8936002)(81156014)(66556008)(66476007)(66946007)(36756003)(186003)(54906003)(16526019)(107886003)(478600001)(2906002)(316002)(66574012)(1076003)(86362001)(6486002)(2616005)(5660300002); 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: 9An8SdGPqyeOGQtmpiowlgVhnWGL4VnT0YcP1Rgx83NJY8P2hGzyylxgfcNoAvyWliYygQ1XOru6/LkXYfK+VBIin25aRIXpybmdw4l5SpvQvEBS7TD4OqlkCOhbB0rAO+065WbPBXdz0ibID1t4i1vlW35ZpJneh8DW1bIW02B4AqTMNdXQtZAuCNsFeyraffffc4ql0d3pbAxggzQasgiQsgxYVJuVdYo1DSLMST77zSWPCE+Tm7GiC8IQOR0WjxtKCdoAuHbm3xY8vH7MBpmVAh1V2W6NMwj38FYXqiU0OhzKHplMiAP9KJqt5o408c5sa0MoiDXeUoEyPADZAY3qrqSe98hPBuhFm+wqRbZWH8HZHeJkiKlrxTOgbQRdjcjMR2fsF1jn32JZh7WeiV/JP+di7okbWM3RAXjXVXtpRWgUzL9hRJHmXvXnumwD X-MS-Exchange-AntiSpam-MessageData: NK+rS6zkyaWLH2XfPf++3e3QsgruV99K+PijUrDL73l7cV79CSefjxyaJLtx9P8E6twuC32ZreEJDFI//6Sm3WJPeWcLc5KUUSJSZsT0xtmWbSSVOwxk0aoDHjwwgEIxyum+bhz0Ouo8frfj2NPrUFRW1n4fF+CZfFEgRq9rZjxRkB04HDoSWiexCRFPil52AfscxdTtdjMqbILVTp7W3UGsrG1+hUu9dG17BVY9a+pKLisoH4o+APejO+dC7twOQfk05RrjnsKehmZOJ0stc0bIz2JfvfGm6T7TiMC+iKH+cAnhe0+kppRnPx3qMD4VkfGIN8tkEQKco9yhiiD1hLaEg878faOznhIqqTeaVB6xpnbjKuB8wC6m08tBxnF3r2vjyXuKfPMIjamp8CqEY3YBfELdtNSc5dyPSqcbyFNu1FwnsZAuK8yjxQSwYKUni9+AFONj7Ve+FK1jrmV44Mwk1t/PNb1Vot4HPV6p0HWEd7m4dylm1ymByhxPhoa603lTyxvPOdo7Na7FmpgP64Rwfb2kNbtngxm3F1Y9l4TX0dliBRiV1X0pV4HdXCh8+9acgTzQaCdcLBxNTbKWJRhDQ9tbUAQAHALNI0EjJTXbc2JDTFNObeJMih5y9gO2C/2qS6pS24T9I1jxxcxI/ODiICH4d7QNWsYK8VUL5CSWK+zNHvT8MNZX3aqUNM8NJfCEZ2yYtlUTJjjjsN6O1ReMxFaLxkeKWqv6Rqdherx6cFRRG3U8X8bxrsBYQAylPIypDdv7UWncx9Iq2VxLyaKXRF166txqSU+RLwyOPVc47819YnHE8jgY5l62/Epbh6OlOFgVoLfXzjUF/wP/s4MXBnudsbjf2XqFNKB4WYY= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: b811b26b-b4bc-4264-25d8-08d7e544676b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2020 16:03:45.5464 (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: LUpqtIRDnyPAbUEQrOahzkJQrO4pdApRcsbEP3X7ARNm/gZ2cpaAIm/vTq0U7JR94DEk7TgE79f4AUR0EIracw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHSPR00MB249 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller The structure hif_req_set_bss_params come from hardware API. It is not intended to be manipulated in upper layers of the driver. In add, current code for hif_req_set_bss_params() is too dumb. It should pack data with hardware representation instead of leaving all work to the caller. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/hif_tx.c | 12 +++++------- drivers/staging/wfx/hif_tx.h | 3 +-- drivers/staging/wfx/sta.c | 11 +++-------- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/staging/wfx/hif_tx.c index f49ab67e1a6d..17721cf9e2a3 100644 --- a/drivers/staging/wfx/hif_tx.c +++ b/drivers/staging/wfx/hif_tx.c @@ -321,17 +321,15 @@ int hif_join(struct wfx_vif *wvif, const struct ieee80211_bss_conf *conf, return ret; } -int hif_set_bss_params(struct wfx_vif *wvif, - const struct hif_req_set_bss_params *arg) +int hif_set_bss_params(struct wfx_vif *wvif, int aid, int beacon_lost_count) { int ret; struct hif_msg *hif; - struct hif_req_set_bss_params *body = wfx_alloc_hif(sizeof(*body), - &hif); + struct hif_req_set_bss_params *body = + wfx_alloc_hif(sizeof(*body), &hif); - memcpy(body, arg, sizeof(*body)); - cpu_to_le16s(&body->aid); - cpu_to_le32s(&body->operational_rate_set); + body->aid = cpu_to_le16(aid); + body->beacon_lost_count = beacon_lost_count; wfx_fill_header(hif, wvif->id, HIF_REQ_ID_SET_BSS_PARAMS, sizeof(*body)); ret = wfx_cmd_send(wvif->wdev, hif, NULL, 0, false); diff --git a/drivers/staging/wfx/hif_tx.h b/drivers/staging/wfx/hif_tx.h index f8520a14c14c..038ea54e2574 100644 --- a/drivers/staging/wfx/hif_tx.h +++ b/drivers/staging/wfx/hif_tx.h @@ -48,8 +48,7 @@ int hif_stop_scan(struct wfx_vif *wvif); int hif_join(struct wfx_vif *wvif, const struct ieee80211_bss_conf *conf, struct ieee80211_channel *channel, const u8 *ssid, int ssidlen); int hif_set_pm(struct wfx_vif *wvif, bool ps, int dynamic_ps_timeout); -int hif_set_bss_params(struct wfx_vif *wvif, - const struct hif_req_set_bss_params *arg); +int hif_set_bss_params(struct wfx_vif *wvif, int aid, int beacon_lost_count); int hif_add_key(struct wfx_dev *wdev, const struct hif_req_add_key *arg); int hif_remove_key(struct wfx_dev *wdev, int idx); int hif_set_edca_queue_params(struct wfx_vif *wvif, u16 queue, diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index 6cdb40a05991..1cc437f0bc81 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -470,16 +470,11 @@ void wfx_stop_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif) static void wfx_join_finalize(struct wfx_vif *wvif, struct ieee80211_bss_conf *info) { - struct hif_req_set_bss_params bss_params = { - // beacon_loss_count is defined to 7 in net/mac80211/mlme.c. - // Let's use the same value. - .beacon_lost_count = 7, - .aid = info->aid, - }; - hif_set_association_mode(wvif, info); hif_keep_alive_period(wvif, 0); - hif_set_bss_params(wvif, &bss_params); + // beacon_loss_count is defined to 7 in net/mac80211/mlme.c. Let's use + // the same value. + hif_set_bss_params(wvif, info->aid, 7); hif_set_beacon_wakeup_period(wvif, 1, 1); wfx_update_pm(wvif); From patchwork Mon Apr 20 16:03:07 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: 215914 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=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 F1139C3815B for ; Mon, 20 Apr 2020 16:04:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C7C4120775 for ; Mon, 20 Apr 2020 16:04:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="O66d837x" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729895AbgDTQEr (ORCPT ); Mon, 20 Apr 2020 12:04:47 -0400 Received: from mail-bn8nam11on2081.outbound.protection.outlook.com ([40.107.236.81]:58834 "EHLO NAM11-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729643AbgDTQEQ (ORCPT ); Mon, 20 Apr 2020 12:04:16 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y7Hd0KyN06YMD8bt8yVekDxaQ/vEW8zXHmVRFG82Ug/Dz3RZnR6uIE7Zjj5FIFPeUOKVxfZtvv6NNObZINGIv+pI2E2otKz/CNEQHVSEnWJEt05PaNoBY5x92lgstiex2jTbmg14eXmQ5DFi+44jE+kFCCa2/B8uHFSbjZpspAulO3QAJIUgk+/+g9VQe2Q5qoLKl7JUHhCZklfEEbrdl1+ljMESgDx7srewifKx0/VAqZEfD01+94c81Vd9TcrijBR8rjIie+YumesS7cTvwyg2GvE0IjW5fF1Giy3DV4BX5D5AYVpO5sm7yO30msTz0u2dcW7xi17fTl6BVok4tQ== 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=Kk/HpxK0GTj7b/iN2wwOyMcMXOJ8aVE8FEbqA47Wvxk=; b=FPmSd24cXPOFJ+wepHJDQv1Px8PubHSNFS5BltsJ0Y+S1o57NJEjKeLsrQ9kHAjycfOMiKcpghpXemaCSRxIbLRTgrxaAlsrFA59lPYlUH9HE26uqFhXmdSFLIcIpsyX6I3cdbAOqhwRoPNackWplPwIu1ZYguyTg6dQek5uyRmj0GUpwug8zjNuLaQhT4xtFLJFBTMdqd1rpCN1PgSv1LiaeJfvB6nWAma6CBOP0RRI63NV8lCcWfMTxgz9jecZHcaRuf6sL6/ZGVeSpVWSNeeab3tVHoF8G9PDO6N/3opH9SSQoLTk6gJNmUbe9WkFJMfFrJ02NTxc1WfgNZd81A== 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=Kk/HpxK0GTj7b/iN2wwOyMcMXOJ8aVE8FEbqA47Wvxk=; b=O66d837x5T8TAT6CWUzZu1y4D0MlUjyaJkLpIZxq+MB6pH029WP1sU55Kx+fk2dzhZW5uo8L/d9n6ThEf4e1xU28PS6vrJYAvnQNRdOXTSAE0OecoFjzBxjae3RnN+EuptTwR0b3vzAVwIEsHmdNjkgg++UUK6V0PK6mRdVHGb8= 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:55 +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:55 +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 12/16] staging: wfx: drop protection for asynchronous join during scan Date: Mon, 20 Apr 2020 18:03:07 +0200 Message-Id: <20200420160311.57323-13-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:53 +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: 2a12be56-8fe5-41c6-c817-08d7e5446d08 X-MS-TrafficTypeDiagnostic: MWHPR11MB1792: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; 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)(4744005)(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: 4Zu+kwzgwpuhIyeNKBw24REyj6JO4wqWR2oVXyPtaX4pNlPVAnAVYph6z5EZYkmdw1V8HG1COaQD6lkf5V36Wifkl8FYlh32nb0XE1OlrGMez2gsuErGhVQyHTQraAxvO90OfwJOKXwU/gsepL6vOnKLzSWliCWxbQgqfl6K095yPrwDjjzXphUdwrjFoIxyeWh/Rvd4NhJN3zsFVM+ieIxtL8OlLWkDEPINhzAZdnVSmPQ+6fbkV7n/jN0FzMtfmxmV4FRCP6VC4W8IZvy8c4aOH+zPffDnS6y3mG1hS61DK2GXrVxlIkzoKmEUpjvqSpBHErpSwLRZ+JWx6H9jx8TPgj6Ds6rdvVmwynyRaOni/DOT3aoFq0fm3uSVNemdgdb1KJJRm6A/vs87n9fZBMQ/VNXQihe4oJ37oigGz+a1hCxP5z2nMKNkRt1gVZ7X X-MS-Exchange-AntiSpam-MessageData: rINdKNBa022eden3QJGWbFuGxCN3P9qGfwwme5oqHvMnmU94flXL/g0lXdlTnCpAMebqaEGYAZ5XDn1vXZOp2MKbPVbFQQ7RXcCQWGcD/lpITJo4ZU8Qxn4k+T4UGruGSmH3e5tGIKxzk6gv36zivUsgIARQg6eusbilAKu2lBpIsAQeFub/EXLVzGn79+V5JeQPgKNH9zsaDIUK7FwCjte3smydO6CedTTLvO7/4ZNEm7ST3JRIEc8oTLZjXVAZlv/g7p8Y+crfYc+CF6SXPQXixX7S0zhkxBv80tiD92AhaQW+nFlQjDovXjLIi5PcChgAJaCWJIQwqIbuNkvTcI5hXtHXCTMXIktbUMgWYn8azIcB+ioXsD3nAYpj+z8/JT7AzOgQYo4CXfD0O2DGuL6o+HzhW3j1fsgEM77Ez3kyanZzvR3FsB3NlfhwGHdSTM0juT00xxYFhhkntHaainN7Wxct9N85fEw3nyhBgV1E63JEm9+kKc0QCFsTzKwqY3MUbc+JMsYsYX/jIcwd+6snE2Fxe8eRh8IlhpiYaIvIEOyVRprGgzw6Vqpvd39GLY98i9u9WiODEo7AXlG99Vd0tT33bkiHqAa8PgWBd0SIX+g/3boWdTofMzrfTmdAOkc7FBgW64U03KPhCT4KIz1KiR8V11zlgu55SRia06X8X8286Pc+VXS4+eyu5vb5ewMnnobm+jHWsjsSRb+2blmcppkoktiDfwlbRrXZc2vFbnRrnz+1DaDAyZxhLzaXIGKQBDiEcQjI+VnEoO5wkroI+2+hP0gGBQseUBHNeNBx9LhqlngEffwhmUBm+kwLC+whe6cH/+LoNEIxo2Qf0zC1zB3Zo1n7QUx+Prq/DdI= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a12be56-8fe5-41c6-c817-08d7e5446d08 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2020 16:03:54.9461 (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: f+nuxCNeehYLXg6ze5AIkQrTiuXcNC1/6/iGMEVb6iEmhe1/sMrsz2kVzA8cK0wC3O+A9Lkg57ydDEU/Q+kDiA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1792 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller In former code (before the inclusion of the driver in mainline kernel), hif_join() could run asynchronously. When a join request was in progress, it was forbidden to launch hif_scan(). Now, hif_join() is always run synchronously. There is no more reasons to keep a protection against this case. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/scan.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/wfx/scan.c b/drivers/staging/wfx/scan.c index 276fdacd7143..76761e4960dd 100644 --- a/drivers/staging/wfx/scan.c +++ b/drivers/staging/wfx/scan.c @@ -110,9 +110,6 @@ int wfx_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif, if (vif->type == NL80211_IFTYPE_AP) return -EOPNOTSUPP; - if (wvif->state == WFX_STATE_PRE_STA) - return -EBUSY; - wvif->scan_req = hw_req; schedule_work(&wvif->scan_work); return 0; From patchwork Mon Apr 20 16:03: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: 215916 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=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 B6EBAC3A5A0 for ; Mon, 20 Apr 2020 16:04:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 933A620775 for ; Mon, 20 Apr 2020 16:04:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="g8eUQ3z5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729809AbgDTQEW (ORCPT ); Mon, 20 Apr 2020 12:04:22 -0400 Received: from mail-bn8nam11on2081.outbound.protection.outlook.com ([40.107.236.81]:58834 "EHLO NAM11-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729710AbgDTQEU (ORCPT ); Mon, 20 Apr 2020 12:04:20 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MExWu/qY9IvU5qoSY25HcYgSBGny0vDk0w0QadxJxCEQMbasC4PcB23PTfUbmsmDEZ9XGQHB6S7agulGNJA1zxPkzXTn7xh85Edz0HkMmxjvjKD3g60lRJ5NAZXy8t4uzAPKSTUbI6qKURrUlrVDxqx3Apu72EYhx4NUdQoLiCBGDNQnt/5kwo2A98dTygUF+dLgT7xiy8GndZAsXwEXOO0SqYkHGIR2edbnv5II/JZZM8WCDORUBC7vhxBoFy73/O/8wCsJDQnppXGYbsPQ0sfvxJtSU8cVLQzc7Kea8/4rWlHXh3ZxApRgkcSYfbOyKkylw6L53hptDZznr9O9Xw== 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=DURtoK7Eo/KOt2TOBS3HLim3hNZQVHhh43H5x2GAUvo=; b=exbhzELWKN7hhBPh4Rz7AjxHWIJMF+U1pKcyHz0Glw2HKDTjMZxjtdY9lVNrFwaoj64x33lm8ztAdG+iSilr2ypeBa++aYBgAxIsGbBega45lnhJ8HDLqDkPnTcrfAbUftVNqbyGUZAgTdP7v0/ok5UOplWpJM5McIb7C3PDT905vy/fcXVTpuXtf1iBrZVOLsq+ifcn8u3YZ8D5zzhC+p4LNDH+re8+3MO3pd+55OgPfPLKgr7FRu7rGLIGMvRIYnxiR6hjJ2wmAOniJyoFdLxSHQ44NoQtq0lTnfHZ2i6rUA3h6syoy2pFjjm8OYfaH5YHq8T0oWoaXxYR4W7/IA== 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=DURtoK7Eo/KOt2TOBS3HLim3hNZQVHhh43H5x2GAUvo=; b=g8eUQ3z5xYOm92twCWDkWwNDxgrygID4zrYbJULAArgEHOCbbis0Mct8LrDJsklko0j+HjKONr2vEHSibp0Ss0YvUt3szo1c7OZeb62alQe7j4Fub3IYwgXZZ5HXXxbGWhxFYlcQ03dnNeCF0vvuVZgMo3QsT4go/9DOogQPuPU= 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:57 +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:57 +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 13/16] staging: wfx: drop useless checks in wfx_do_unjoin() Date: Mon, 20 Apr 2020 18:03:08 +0200 Message-Id: <20200420160311.57323-14-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:55 +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: 0046ccdc-f3a6-41c9-99a9-08d7e5446e90 X-MS-TrafficTypeDiagnostic: MWHPR11MB1792: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2582; 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)(4744005)(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: MCXO44sGTc7ItFqXhccfQ5FLRj0q8yOg4QtBxxTOXlMAG6Td8bQAAasXdsznPZXWxfh52cMaZpP+cEiMBu4oElWhK1ZeZH61W0YOufUm6/j0tU9j4gC4Gk2H6PVN8GoICbjFwV0Ayt80yHlRsSo+fz9O+2rCjOlgOnDgp+TDh9KozLAZRI5QV4H9c2sTPXjbrCstzOQpzXwjw7raO+odJDW8uMxVtbTuEUGtxD219VZxR9ILFC5lVCVZFseFBFbFo4HnFEUpVY0TVQEuStjeFdjn9Uq4hQ1rJEGWXNRGaxeUytGOc9uuqdL/sXyb59UDzawgmjAqUWGqZgQLK4cqP788JssRxj8XDBMTCfRdgu36W4TJ/UIwm8jMDPF3GRM60+21OJMgUUbtv4P3WDCeglGc4j+VoO4vqmiQ8X+YzVM4TcK8RR/9fmjKNZNvXDsy X-MS-Exchange-AntiSpam-MessageData: 2L65xFSs9gGcpRE87XR7DFRt7htDr8UWSwRIvZYC/eUeJ4VXchld1EypyngKnbN1YtCyV3qEqgrYepm6huTAY/q41tu5CmoIyIUuOg2+VcSOEwLpZe20kP4H0dMcOlnxD3gBPsBgbOw9TpfBv7fyXda4jm+3KVjLJ1BzL2np7ZpRu8q2G/GJoRBfZJhXKJHPW4Z2DjDPjiDYBi6774c8Ii/jmi/BYNZw5h6Rds+7uadQzoQH/sTZMjLURblSIXgNrIrqQ7tBiQ67G7RL3KMI3bKmu8Z2Soum3d+4luYJyD2B7yVaT54K7zw555Ba4UVJR+RAXAIGn+Yb2DbI3ZE0G/wnlWMWdHeK+f81GATuBEhJkoQ1N1S0V/+vIzJTw5NIYiH2HPrt6j8V8z+8A1JS5ehHg0JtLliiST3K4lhP1iKp93aDh3dV+ly1IqwW5HQE5zAcBzWLDzAXefmxFgjoYqscoIFiF0GHFBjWohyxX/XU62lnuG7EBg9efkQefBz0CrFHyA6GfmUhzd26lEtJwIkxShGbxaE+GxKx2EQh+9AlUTn6OQBcehbdGWEmYr5yyD647tdb+fjfbHjo78HHymQ/npzIOpLFtGsE13gLSoTabn34tgYl70qRwHrAHF+69EKtN+XwzY88smIWfJswyruTqrnZzuY9M2+nNgetq0dXKe4y5CBE8gsunqc2LRLgEBP6htZT/jiQnbnUIufz3KAgVaZwvMoql8PKMd1fCryioasOr2P9i0GgAb8gbH8XvHQJ3enLUBZhIHG+uuDeOClovmSPaubbvSoHDhlSqotpE1OidJngmCJNEznNnkInQxVxScMkIBpGsCnubthxSUb7Jn30R5Wo6wNZBlaFKZ4= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0046ccdc-f3a6-41c9-99a9-08d7e5446e90 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2020 16:03:57.5329 (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: yz7mZRQeVWsGF6FpiessTpCAjKx+uV6IyNokODaP6Z/yrv49l3Cdwwsvkt5tG3dbhM83qPm15lqLC5mpmv9IRA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1792 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller The callers of wfx_do_unjoin() already take care of vif state. Therefore, it is not necessary to take care of the status of the interface. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/sta.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index 56cb6fff4a06..bc891b6e4392 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -286,12 +286,6 @@ void wfx_set_default_unicast_key(struct ieee80211_hw *hw, // Call it with wdev->conf_mutex locked static void wfx_do_unjoin(struct wfx_vif *wvif) { - if (!wvif->state) - return; - - if (wvif->state == WFX_STATE_AP) - return; - wvif->state = WFX_STATE_PASSIVE; /* Unjoin is a reset. */ From patchwork Mon Apr 20 16:03:09 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: 215915 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=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 C765DC3A5A0 for ; Mon, 20 Apr 2020 16:04:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A832620775 for ; Mon, 20 Apr 2020 16:04:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="VJtSGReh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729783AbgDTQEV (ORCPT ); Mon, 20 Apr 2020 12:04:21 -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 S1729560AbgDTQEU (ORCPT ); Mon, 20 Apr 2020 12:04:20 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SpYD2IZH0O90Q8+cVpt+I/idDxCrEV1nZ8+1b6HfpPWXfhB6c72ZaDyfSoP0NF/HYxVbigyGzFF+0NUytASb9nDnYagGwc9ijSzOY0iR32MGhp8WP4uhvKgkhW1inH4Yvx2C5wW5JovXfN7vqZEHLnc2g7+pcqe2adxVKoon1efpykeNoOV/fuj+DHtuMReQkwSb/T3TtN0u6joyi0We8HawV/pjXFpjwvcI74ff69uFOvTIwFqFVMtYEYPU36pwMN1lSA3BtxkfrEGJp5GTWeFbZTdRvdlLN3vxka9aFHR/giWYwx0m0UxRcjKDZiAWrLy0hD/sL8o+9sHaakVyqA== 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=zJa48eiM8960rAPKW6VzfCfm6aLZSx6nHilBqrxG00c=; b=kuZ4Ra78opSAG3dOS+aICZSEPM4AfP6SL3428tIgzlil70YdVvtWUSkOcD5CiMVzCBuKwoAepR5/dQFn1cJbId+OX1daCZS152IQZA7U1K6IsXzdNEq/xXr2zwtBpdzJgyJa2BLZCvASFY7ZGZufcIamIgA2/5jBIB4o1ymMTKuU98+X+cBZzviQuZNEHhNqMGA9unAxgwj5/Y+RcHfvanJUmOtZCVVyQc7cmulUPR8ZX6iKz2+/uQlvYTKCMXgLMhlADCcneFJJYZydcPBXUXa802w9wy/8bXbKHnxOnlZziGtS8j7nzNWC/ON8n3J0luAUe4f/XaRVEdb+ARGBEA== 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=zJa48eiM8960rAPKW6VzfCfm6aLZSx6nHilBqrxG00c=; b=VJtSGReh6MsvdGGrj1IqNROp0BDmdAa+shhyzidLxL2sCnf5lpMIz+iHNbbNnK6ZIU2xZI2qJIBZI2BxGnL+POSR3npU2w4gjwUJRv5nvcaTrplQ3uGRyKCN+ibEVnFFUPq10ZK6pOF3RDxEMO4932iUmj0meJrUpqHco5hrinQ= 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:59 +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:59 +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 14/16] staging: wfx: simplify wfx_remove_interface() Date: Mon, 20 Apr 2020 18:03:09 +0200 Message-Id: <20200420160311.57323-15-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:57 +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: 1dff7dea-775f-4aa9-e6a4-08d7e5446fe9 X-MS-TrafficTypeDiagnostic: MWHPR11MB1792: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1122; 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: 9VPsEzHXNE+SspqoqvyzPJ3YLdKqDXfI6ojBKNZUBQb1bXL2ohMinSpx7+9fM++abVaaJmgg9ZETKVR9tJ+Rih4B+xDSRi/YvfuIn6r7pwT7PmdFysG5z0IXV/iJIRNGOr5R5akIAscfH7dDZPD4+RDq/jnQmnZRFbIn+AI1Dh+0Izz2/JcBwl7q6hkggoTBZH9/FnBPXea4K3uwN754ZtvhqiFPOZdM5QaDnGRi04Y3VTJ3m+etrWRp/UqpTPLzRGp/m2DCHNvngP3daN6MM5HA/EZcBERzQbTiY0aUcr6ftzb2uvLurIW+nFzVJ4X5tMVKY1f89ym+zfbGBP76/dvSoEzJWxIRetrhUjpfTno1bnP62V70OqGXriAuxxLUd24dStRGMh+LC3AgYjPgAtZOMWSQswwVweOkzfGIfFffRGcyMrcGghJ9KtRbXWMy X-MS-Exchange-AntiSpam-MessageData: 513piUIs3SKWdvvwO2oxiHYBIj/FIrhOFjIazLcmWurwgzNq6nGP2cJookzNHhHMlvpoUrVHwso2QHd4ndl9IxWipGbbdtTmoj4HYY1fSAcWY06OtpX0g/nKeI1aGYyxhSPQU2K6q5M5G0Axwiefzqe6IdA+5RHGNcuvtJk5XGVoXhV0enfrejIDGt2PPGJG7qKUh4+eZbLiR+1HDkILRVpO7NELIQvy24GadtbkanJpKudGOHy6Qe7+7ttUUiDJtx5oCgczLk96iWYmHetVOxdOHwCUPP6bGWF/7cOu2ZGZFIm4iUdF8kzxFPA7i6itt4IALxO07SsIJTYYBmCRG6hr1Amb0KF9jtoZQeKpMMIGdFB2b2knC6SwwLnPpQ1ZSV6STfcGVA9dgCi/wGBRJpfKzl59KWj+ynYhec7SLuol21JMeLPPX2++fXvAi6txGL93T7999KlLa5w283SidfG7SJCvJBEAAhdP9gopDyMUDWNohrxZJB5W7BZndkaKtdWX9CrIBAIWsL3E3Gp+p4WbostSAYY9W0F+pM29tctECiaZDYv1/bVZlRdIi+Ei0ssIy4cSHdIkekAlOsRYq76Rt7X/wfb9nss99R/24l7V7d0m3b2oWn61cy7Y2X9kO09i0PAhH57obGOQnn/ZSw3iojws4/xHp3+jFPgvgOzJht069raoIhrHseYLo1EjVjvbxqJRoY79WweFdtm49d7+BlF3nO6md1cxTVW77JRjF5E4YHd5aUxyNBaYeZmMWs170vj+wZpEkHBdM6KDqyu7nTA0LepadeYqWKZZrcnwj4xU9BsJFgXp92M/np8D7qDEY7cdJWXbNUjdx5j9IFTYlcz7/sv5c8v5zp0trUY= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1dff7dea-775f-4aa9-e6a4-08d7e5446fe9 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2020 16:03:59.7729 (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: RDpVvAhRsVMHmZHWClkFiob1HoRS/0yD1FrfkmZ4Z3ghWWjlWoGb/5jt2NCTkE8UTGw9y6PNLQpHLvjbYL/2cA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1792 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller In wfx_remove_interface(), the current code differentiate AP and Station cases. However, it is not necessary. In all cases, the only important thing is the call to hif_reset(). We can use the same code to support all cases. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/sta.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index bc891b6e4392..1732f3d0a1e5 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -785,24 +785,11 @@ void wfx_remove_interface(struct ieee80211_hw *hw, mutex_lock(&wdev->conf_mutex); WARN(wvif->link_id_map != 1, "corrupted state"); - switch (wvif->state) { - case WFX_STATE_PRE_STA: - case WFX_STATE_STA: - case WFX_STATE_IBSS: - wfx_do_unjoin(wvif); - break; - case WFX_STATE_AP: - /* reset.link_id = 0; */ - hif_reset(wvif, false); - break; - default: - break; - } + hif_reset(wvif, false); wvif->state = WFX_STATE_PASSIVE; - - /* FIXME: In add to reset MAC address, try to reset interface */ hif_set_macaddr(wvif, NULL); + wfx_tx_policy_init(wvif); cancel_delayed_work_sync(&wvif->beacon_loss_work); wdev->vif[wvif->id] = NULL; From patchwork Mon Apr 20 16:03:10 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: 215913 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=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 1F17DC3A5A0 for ; Mon, 20 Apr 2020 16:05:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E39B820B1F for ; Mon, 20 Apr 2020 16:05:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="BkC5wilF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729530AbgDTQEH (ORCPT ); Mon, 20 Apr 2020 12:04:07 -0400 Received: from mail-bn8nam11on2067.outbound.protection.outlook.com ([40.107.236.67]:31360 "EHLO NAM11-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729267AbgDTQEF (ORCPT ); Mon, 20 Apr 2020 12:04:05 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mVDZDeUmSJ5poq0mihgEg+1gY5DhncTxb3B86946yRAN0/6N8Piy0DjU1lzrcWjk98enTo3Z+9WOpE3ugXH9pCJ5LfMUTT5/7m3Tit0bxB4YBPA7y/yd5RTOTpw8luTWn/BSDq+2ynfr7IaXeDBCkG7td1cUSlJBvRZ15kiPZcPKymr6jJ3bvU6kkpumshvhOrL/5ZrjlPoZk1QgN0wnHxxHatL7faHHIq0Z4TBXu2QvQpWtXKYQA5OZbnTaoWsUoGNT/H0vWyQSOEaOsg030GEWeY/uw1rIPHg08mTyHpFY5yYE/hAc8s1jmhRV0Eb81wodr9i250IGU36g6Oy3zw== 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=Xw7T7f7hrYyhFdaSjG4PdZOKuWDOeu/vP9hEhfuhEI0=; b=VMVyXqVkSGh+oLy0dIvq0QhmwpEiJYn6187Bkg312ucu4M1Rm9YaGULolLcwlyjv8uj5z+YsEwTixh9eXSWGc6fe5XT1gniK9/a+w9YXK408XHY268zZRsTispD0Jw+NdYOv/+aXGz3VoEvt50EBvN0z9JKJcslf38IvnEqXsfhxW92elgJz8FhQvvwIFt1qj2BpoYDQlrXAsBk1vMz0Fza0c4qxOFm5vVljDEN5/jRSjnSg2MjjM9t5yWTZ/qUPcPbb0B3TT5gwkK2FQBzwdmfzgh69WPkll1mcWi2H7f8uC5OgdqD6d9jc66gp0UkZuEnGDDUjKOa7SMLm7m8vjA== 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=Xw7T7f7hrYyhFdaSjG4PdZOKuWDOeu/vP9hEhfuhEI0=; b=BkC5wilFV6zmf2IVhLn/H+qKcbne8ZDJUQtz3GN3UzvKzyuqoTH8Og+o+eGAMgpf32+PwDHHnm/oVRdq+YEi7ptvsWAEpne0ps0kYVbqJBODOnQ5fraFcglB9qacBU6AzvNXaeqTZmEsVhe0EvBqVRpbiqYQZFAnHfAiun0oKFg= 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 MWHSPR00MB249.namprd11.prod.outlook.com (2603:10b6:300:68::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25; Mon, 20 Apr 2020 16:04:02 +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:04:02 +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 15/16] staging: wfx: drop unused enum wfx_state Date: Mon, 20 Apr 2020 18:03:10 +0200 Message-Id: <20200420160311.57323-16-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:04:00 +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: a8a2d833-8262-4d8d-9778-08d7e5447142 X-MS-TrafficTypeDiagnostic: MWHSPR00MB249: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; 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)(136003)(366004)(376002)(396003)(39850400004)(346002)(8676002)(7696005)(52116002)(6666004)(4326008)(8936002)(81156014)(66556008)(66476007)(66946007)(36756003)(186003)(54906003)(16526019)(107886003)(478600001)(2906002)(316002)(66574012)(1076003)(86362001)(6486002)(2616005)(5660300002); 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: h8IZj19/0+6c/gFh+Rx2c0TtaKOTPzb53MmWme1XqqKnkRLO6TfQ1zQdkbw/CIgOe35BdG8X1rjAZ9wiMl7ruvL3J0mCPVt9KA3mcLEo1Fky9AjjcmUwZe2Y9VRghySXlxDae4ChozEik+PZ905jaU/T/0T+HVtmmBCrVbNl0by7k6waanmpPJXusmO6Y9WPCUsOaFAxvoBWt2W5ju6XK5c9N9rzEQrrmPYG6456uLUEBu7b9irD93lWFVDQGb/5ehoaxjaIAKxu6XPIaHF1q+HJ+r7v5vFMG76cMF/pYUKDBq6AeiMv1cHv2rILROrbGtMEUrlvFrqW6sT7sneOHwckGRY39Exaeb1Z9Ds4y0XpebkUPU3FYCqbqSoNCxBSPXtvvTo3oIDaMAm6avE0ENWTRuce1bNTWqdVqPhov/skBtVjhocl24cBdD6eI7vi X-MS-Exchange-AntiSpam-MessageData: kQaYB5HBm2d9CZrVnEOv0vtIgA8eqytEaJD7pbRSdA9y8PWfQhfLsAeYUHB3J8dldSiGX/PE0xjt5XrLG6gH9faYguliARnl3mLDvj3t67UJivkF1D36Ha0IPJztI9eCd8v7GSj67zqm9i04GF/jBLn3WSDgPZltxGhLtEF382K02FKld8sj93hC4P+7ZnLdhu4TeFqet7Rrqaht6PcTptXN3xIupLOyuhnuQJCea+NxRUb7cy/RbSb7Ns3xyhIID7GEJzD01U13OMjDmKkjOyGsst5ow0X9FdyTjZwpWq1Xb1ROdrE9mG9VzBBl85vUOMvl89hcjIaVzIT8w8B/k5tUC6yvC+TdQkzNWhnFUQYy1bkPGzArFXyEg6PYGEDJ1AWmG6Y1wwnYxw9iu9pZ/Ct44AfMofBKuXRI8ymKg7rnUSjRSBIu0aKqMIq8UxVACrbc81+LbsdPMjMEZK4nIJScW7Gmx60EGkUt160sV2NLVv6zM6xeIm/vPf3hjWhfLj1lNHawqc/P1aKBllK5hlFWzsbClcg4Hs0QTwpvhNDsdsMvRSxAVhuy45A7vN5tL9Go5gE38wkwpBPcmObi2Cbuszv+vpW9TgNgR+SGdngTzNMC0qr7ohGhPiGjp+HRHwBmQEMfGvb6miyPsywVsYfRsvxAFnvFcUDNAV5xxrg4NNDyef7PFqsUgg45HSKdCRQnSl6EcZhHSMv37l74bgcLObYA2RoyWATXrRD9clq022yQs+JHxEsqVjq5k0zN9eAPENrXXN2G8di62jZHJRCcEFRjTMg6/7TZX+3HipgqJWF1glwDwnTTMVBPUl66kVKKC6Bxvumm+cSIVwHCkAvp33JrOfiaOSl3wVPGwNU= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8a2d833-8262-4d8d-9778-08d7e5447142 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2020 16:04:02.0099 (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: x5UrRqeZaJZ+hhUDmnKY/5V7FF9AiYVCV8Cc/G9xI3FpXydHy3dQ3H/W+qPT4ih/eShrpr8nA3AXdd39YEw45Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHSPR00MB249 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller In former code, the field wvif->state was more or less redundant with vif->type. With the lasts change it has become unused. It is now time to drop it. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/sta.c | 13 ------------- drivers/staging/wfx/sta.h | 8 -------- drivers/staging/wfx/wfx.h | 1 - 3 files changed, 22 deletions(-) diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index 1732f3d0a1e5..1e43e3b65953 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -286,8 +286,6 @@ void wfx_set_default_unicast_key(struct ieee80211_hw *hw, // Call it with wdev->conf_mutex locked static void wfx_do_unjoin(struct wfx_vif *wvif) { - wvif->state = WFX_STATE_PASSIVE; - /* Unjoin is a reset. */ wfx_tx_lock_flush(wvif->wdev); hif_reset(wvif, false); @@ -367,11 +365,6 @@ static void wfx_do_join(struct wfx_vif *wvif) wfx_do_unjoin(wvif); } else { wvif->join_complete_status = 0; - if (wvif->vif->type == NL80211_IFTYPE_ADHOC) - wvif->state = WFX_STATE_IBSS; - else - wvif->state = WFX_STATE_PRE_STA; - /* Due to beacon filtering it is possible that the * AP's beacon is not known for the mac80211 stack. * Disable filtering temporary to make sure the stack @@ -448,7 +441,6 @@ int wfx_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif) { struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv; - wvif->state = WFX_STATE_AP; wfx_upload_ap_templates(wvif); hif_start(wvif, &vif->bss_conf, wvif->channel); return 0; @@ -462,7 +454,6 @@ void wfx_stop_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif) wfx_tx_policy_init(wvif); if (wvif_count(wvif->wdev) <= 1) hif_set_block_ack_policy(wvif, 0xFF, 0xFF); - wvif->state = WFX_STATE_PASSIVE; } static void wfx_join_finalize(struct wfx_vif *wvif, @@ -475,9 +466,6 @@ static void wfx_join_finalize(struct wfx_vif *wvif, hif_set_bss_params(wvif, info->aid, 7); hif_set_beacon_wakeup_period(wvif, 1, 1); wfx_update_pm(wvif); - - if (!info->ibss_joined) - wvif->state = WFX_STATE_STA; } int wfx_join_ibss(struct ieee80211_hw *hw, struct ieee80211_vif *vif) @@ -787,7 +775,6 @@ void wfx_remove_interface(struct ieee80211_hw *hw, WARN(wvif->link_id_map != 1, "corrupted state"); hif_reset(wvif, false); - wvif->state = WFX_STATE_PASSIVE; hif_set_macaddr(wvif, NULL); wfx_tx_policy_init(wvif); diff --git a/drivers/staging/wfx/sta.h b/drivers/staging/wfx/sta.h index fe728e642cfc..e814fe743b7d 100644 --- a/drivers/staging/wfx/sta.h +++ b/drivers/staging/wfx/sta.h @@ -15,14 +15,6 @@ struct wfx_dev; struct wfx_vif; -enum wfx_state { - WFX_STATE_PASSIVE = 0, - WFX_STATE_PRE_STA, - WFX_STATE_STA, - WFX_STATE_IBSS, - WFX_STATE_AP, -}; - struct wfx_sta_priv { int link_id; int vif_id; diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h index 354a62394db0..8d29bf77cfed 100644 --- a/drivers/staging/wfx/wfx.h +++ b/drivers/staging/wfx/wfx.h @@ -66,7 +66,6 @@ struct wfx_vif { struct ieee80211_vif *vif; struct ieee80211_channel *channel; int id; - enum wfx_state state; u32 link_id_map;