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;