From patchwork Wed Apr 15 16:11:38 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: 1271302 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=none (no SPF record) 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=XFZBFdOG; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 492S9c1pcqz9sSk for ; Thu, 16 Apr 2020 02:14:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1415424AbgDOQOn (ORCPT ); Wed, 15 Apr 2020 12:14:43 -0400 Received: from mail-bn7nam10on2054.outbound.protection.outlook.com ([40.107.92.54]:6037 "EHLO NAM10-BN7-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2410241AbgDOQMp (ORCPT ); Wed, 15 Apr 2020 12:12:45 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ndF1JfnpJbO/0LaHBYgaBWTsukZ1YivN0LbyVbPYvBann3LTTP2H1PCwN0ow0rkw1MS3uN+TIpYuEkQD3Efao5K1eYdl+uDKXpaEXb73+xdYH0gLWNCg1BaMluV6QXQgxTvHfBgqS4Q83dxajbUzO7L+nxyDLxsZXfL5rxWwWMw237U1xuXf58/bfRI8/cJ/FEFGPlFPMuPLEZl6yzqQPlQLn2nOHpoR+nshTCn2fW0PEkxIfZSp35S8hT7NW+XsV6KFd/EDU5ERZ3aG/y2pXvt/sXnbkMEf0W1+WEpmxbo7OFeTNWnEETndA+wjU4M5CryJcGElxhaeW4+uLcCotw== 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=nU6sNOskPMXTlqA3I0Fivrf0FKMczAep9cVTArvKfOU=; b=Ku7j/bWfbKZkbPbnsPEXuo3wyaakQuVlLhCjFKgcMPcMHKhmNIPgFkFmL0Ole9MfYudIzJjASVpI/isuVqfxCKfTMwk/W1vAv25aMKn1CrP5yJ9BMd+IaZB82A96EHEP3kXdQC3/2RGjaLC5dWdknKRx/tipHmFmm0w3SyojbxLpkllO18xeRhqGOv70DA1R2gCcW5aX7l576HeCtI3uepbWvAMbOyn50YTqvKPcC2c30J1atx/VXssJy2Ks/6MXdTl2MWpOpUDrYbgVWZlH5/bLGI9feotTFp6umL4TL6V8O6k+lnyLWHoQox5jfue9OhAx0LRNGoL1jn7H8qTTQg== 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=nU6sNOskPMXTlqA3I0Fivrf0FKMczAep9cVTArvKfOU=; b=XFZBFdOG+b9fXIG8kRvoAQMQ/LnpvHYoxiJw4Yh8pIkrXKZi7qKAHza8AA9cewCrkYi8KLPacfNXpPS6j9a1z5edF30ZJxgH1P8Kj4XwojrM1THNyMuzjXZypfNa4Rqb+gRP9zdQaq0d6co8i2KbftLD0YkO1qcZcz+fiuqSybI= 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 MWHPR11MB1599.namprd11.prod.outlook.com (2603:10b6:301:e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2900.28; Wed, 15 Apr 2020 16:12:40 +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.024; Wed, 15 Apr 2020 16:12: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 11/20] staging: wfx: drop useless wfx_fwd_probe_req() Date: Wed, 15 Apr 2020 18:11:38 +0200 Message-Id: <20200415161147.69738-12-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200415161147.69738-1-Jerome.Pouiller@silabs.com> References: <20200415161147.69738-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR1PR01CA0027.eurprd01.prod.exchangelabs.com (2603:10a6:102::40) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by PR1PR01CA0027.eurprd01.prod.exchangelabs.com (2603:10a6:102::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25 via Frontend Transport; Wed, 15 Apr 2020 16:12:38 +0000 X-Mailer: git-send-email 2.25.1 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6db4add9-f980-415e-6884-08d7e157d1ee X-MS-TrafficTypeDiagnostic: MWHPR11MB1599: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:454; X-Forefront-PRVS: 0374433C81 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)(376002)(396003)(346002)(366004)(39850400004)(136003)(4326008)(66476007)(107886003)(81156014)(86362001)(8936002)(2616005)(6512007)(6486002)(316002)(52116002)(66556008)(66946007)(6506007)(8886007)(2906002)(1076003)(36756003)(66574012)(5660300002)(54906003)(478600001)(16526019)(8676002)(186003);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: Xzva1H4bY0AVbYCJ6GhpMnLhSa4Flltz1Gq0iBGgLD+fHn6izER94j1zyMuy69cDnlV+qhE4nSvHDlPXfQXIVLoii1rtHdJMDRlI8iO1FvbTM+HdRfzKC3+qEpvLekYZGqIotquU64hT4mk6SxOBgC0rbzV52sRMWLNzDplB19uCBDPdjLiRYXVu0teYqaHeL8HBO4UpC2iIz9ltPDWA2TQb3y4olQhAPe/kOggszX69+cHK/bHwq3pGqDJI0Ms9a23vf9oC+PlfdE5j96lVAUYZ1hKm2H6Xy7GdyplaAPPnK4W3Z0ZCqWtWIKC3qqyk8z6pEDTmYpRRnK9tz6cM5vxGj89yN9472jIUAjTee3HqHnkkZ+x2SW1h+jGJ1QbQBgAPuLqNx54y3H/gC2UPpU4RYcWJlYx9WOCr6tljrrUngSaT08k43Fc7Y+a/OSSO X-MS-Exchange-AntiSpam-MessageData: zOY6d8KMU4yzr8kbCuWIF2rQAC6QjvC834oyQJXAfuUXpL+xkZCPqKVJDjsfAmSMNNz1VvmxoOojDlSYml7o8BOKNJOC2Fvj5+bXIqtpobgO9kGpNKzj/ur41+VnrJC16D/uNN8Ko95H+w6+TZA6xuY/dhZWgOooiaAlcbM7HJHSTAR0DbjkS5xciR5aCIyfDoqPtBU/xoFur5Msb5lDZQ== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6db4add9-f980-415e-6884-08d7e157d1ee X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2020 16:12:39.8270 (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: HSrEAxeCthlfTUz8M8hQ9w4FzOxk0ogD4sj8fv6igRPQpzx8gzqyh0SFXW0JJLJy1UWbszj3ld8g5VGWahoKEg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1599 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller wfx_fwd_probe_req() is a function of two lines called from only one place. In order to uniformize all filtering functions, drop wfx_fwd_probe_req(). Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/sta.c | 14 +++++--------- drivers/staging/wfx/sta.h | 1 - 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index b785b1b7d583..8d2365a2e35b 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -113,13 +113,6 @@ void wfx_cqm_bssloss_sm(struct wfx_vif *wvif, int init, int good, int bad) mutex_unlock(&wvif->bss_loss_lock); } -int wfx_fwd_probe_req(struct wfx_vif *wvif, bool enable) -{ - wvif->fwd_probe_req = enable; - return hif_set_rx_filter(wvif, wvif->filter_bssid, - wvif->fwd_probe_req); -} - void wfx_update_filtering(struct wfx_vif *wvif) { int i; @@ -249,9 +242,12 @@ void wfx_configure_filter(struct ieee80211_hw *hw, } if (*total_flags & FIF_PROBE_REQ) - wfx_fwd_probe_req(wvif, true); + wvif->fwd_probe_req = true; else - wfx_fwd_probe_req(wvif, false); + wvif->fwd_probe_req = false; + hif_set_rx_filter(wvif, wvif->filter_bssid, + wvif->fwd_probe_req); + mutex_unlock(&wvif->scan_lock); } mutex_unlock(&wdev->conf_mutex); diff --git a/drivers/staging/wfx/sta.h b/drivers/staging/wfx/sta.h index 8d76fba5f504..a90eaf5043a8 100644 --- a/drivers/staging/wfx/sta.h +++ b/drivers/staging/wfx/sta.h @@ -88,7 +88,6 @@ void wfx_suspend_resume_mc(struct wfx_vif *wvif, enum sta_notify_cmd cmd); // Other Helpers void wfx_cqm_bssloss_sm(struct wfx_vif *wvif, int init, int good, int bad); -int wfx_fwd_probe_req(struct wfx_vif *wvif, bool enable); u32 wfx_rate_mask_to_hw(struct wfx_dev *wdev, u32 rates); #endif /* WFX_STA_H */