From patchwork Wed Apr 15 16:11:40 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: 1271300 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=MCNDluEQ; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 492S9553Yyz9sTJ for ; Thu, 16 Apr 2020 02:14:17 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1415247AbgDOQM6 (ORCPT ); Wed, 15 Apr 2020 12:12:58 -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 S2410281AbgDOQMz (ORCPT ); Wed, 15 Apr 2020 12:12:55 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z/W43N+FM2AveQtp4tQHvDt87MaW/Xn0fo7CRcQH3i/JHc6+cq4Wxo+FvG0ZzKWzyqW6P6QSXxO0yCCC734z3AEnU/s3J9LnnmLeEAYLhZvw3U/FHkYVmSGWKfQS8Pmm3K8Y3+sjvJZXPV0wiLph20W/cVcbKae13a3JlGmJ/oY3LWo4F16MagroovXa7JthPn+NJlH+vUgtPofqDo7xGYWSIY9C5o8/L96ssPCaF4GgXbSz+vNGQGmS/XIrHxNfsOaK52uy/aHBXz9+b8QLaJsWYM8wIP32AjJ05++9kXoYIsOUNTP7Rk+3yi3KWbP8rTAeanKB+imxeYxHRAt+gg== 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=fiI1Ngo5lz8VctH56hbGmIIpcY5X2PxEb0j7B11g3Rs=; b=HG9/SKf2+JmsQKfDPC7fYv73YpTbBBNbWfvyEJ8y4opNPwkgP63QI/L4nnomzv+QnLvxentibZwbVRPwdA/C+/aTwE+kfMyep5P6FddbfMyz0lXAY1cVGowJnpmESx5TNQBYKIn866pgvRhj9Ggrjtfv4Mnlu0Sa8w9TgzIDp4Zar2clp0oIS2d//MFOveT9xyEGSsaA/uQGJjon0EQhbHStX5f0oAigHvanIo6qkgMkOIqXb0Hxh/p+PVlJVggh4+A5ICPayxsX+u9NYNXXU48WSgWN2g+uZMvJclwF4NNGoCHhj9fouSzU8Wsl8TiM1HHh0YTH/3EEnRQI8fFRxg== 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=fiI1Ngo5lz8VctH56hbGmIIpcY5X2PxEb0j7B11g3Rs=; b=MCNDluEQs2Q8p6wTjvZO2twkVobOdqHWme0IVCvWYTpgooOkNlQTpyoVU1G8RZi96ByB2rmfU8b4y4zcqOOVr+ouuo5oIRn2Emc/Tw6wiRLBs9JH6d629GZ3rdG4oEfkKUrfpshe7IAD2OLzHruSrk12ys76bJ/UiO1MSKEJj3U= 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: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.024; Wed, 15 Apr 2020 16:12: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 13/20] staging: wfx: align semantic of probe request filter with other filters Date: Wed, 15 Apr 2020 18:11:40 +0200 Message-Id: <20200415161147.69738-14-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:42 +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: 688a55d0-704b-421c-a88a-08d7e157d507 X-MS-TrafficTypeDiagnostic: MWHPR11MB1599: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:949; 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: WhW18EeacP7X1k0ag8vbAqkNov7m87/hIOEijDbdjFb1cuxEsX8Sqi7opukIjhl89L5RCAZLKKYz+c6hwCRqPARbK0E1EChzTm6x46fN/2CW8Nn+7fFEwzUJX/koIcEu2kjcHq7iHBPzpoTZVnyTUSAVdAOamr1ed93sUlVz3fz8y0UdRGn0oFjPN6wNAQhfOxeCvSB+TFbYAjWxlxNZUR6yM92qwsF7dlKigrBLb+TxV+SEtzRQLqZnnUcG4PtHTZpc9euQRs186gv1RzGlxL6+aVtk/VM3g7oam5eqqL8Q/zMb8CTPAMCSa14gkN6nr1plMFWa06CbN/IYJZqHHbs2cgRqj8hRBpwi7sp9FqJdwgbrz6z3Es4+FxNynv7X5b9k4CI41Z6b8BJv+Wp+TfucCjnuWcKjr+OWIF3nl5FokvxkyMDcXWjv8316d0gB X-MS-Exchange-AntiSpam-MessageData: vOOjjA/3rcbF9pn96qqRPoTaPWd5mbly0JMENR/mEdB+a01K7lZ2Ra0JnzLntieO9/VReMriLYtYHHDdQEhghrAakwZ/7vvzZyNq5kX2iS1/Ge5z/8Xk/4ghEQ2LlGYh1/05D39L00WjlNSXEtKKQz3bl3Q1Caw5kFYS4oogsvoMG6pdZIfV1kNQNqgdJDmvkzFVfUp3KdXBzCeOivwMzQ== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 688a55d0-704b-421c-a88a-08d7e157d507 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2020 16:12:44.9647 (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: fBbScTTXrtsZPuZB0OseV9H/1hoORNum0dYroprtaKlJP8Ltom6h1yZPsFfKGVTTUVFBxD+PCHOmCs/YZl9LwQ== 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 Filters provided by HIF API are sometime inclusive, sometime exclusive. This patch align the behavior and name of the probe request filter with the other filters. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/hif_tx_mib.c | 4 ++-- drivers/staging/wfx/sta.c | 8 ++++---- drivers/staging/wfx/wfx.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/wfx/hif_tx_mib.c b/drivers/staging/wfx/hif_tx_mib.c index 41f3090d29be..1d26d740bd0b 100644 --- a/drivers/staging/wfx/hif_tx_mib.c +++ b/drivers/staging/wfx/hif_tx_mib.c @@ -90,13 +90,13 @@ int hif_set_macaddr(struct wfx_vif *wvif, u8 *mac) } int hif_set_rx_filter(struct wfx_vif *wvif, - bool filter_bssid, bool fwd_probe_req) + bool filter_bssid, bool filter_prbreq) { struct hif_mib_rx_filter val = { }; if (filter_bssid) val.bssid_filter = 1; - if (fwd_probe_req) + if (!filter_prbreq) val.fwd_probe_req = 1; return hif_write_mib(wvif->wdev, wvif->id, HIF_MIB_ID_RX_FILTER, &val, sizeof(val)); diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index 963cac83b6a8..3a105d485237 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -136,7 +136,7 @@ void wfx_update_filtering(struct wfx_vif *wvif) } }; - hif_set_rx_filter(wvif, wvif->filter_bssid, wvif->fwd_probe_req); + hif_set_rx_filter(wvif, wvif->filter_bssid, wvif->filter_prbreq); if (!wvif->filter_beacon) { hif_set_beacon_filter_table(wvif, 0, NULL); hif_beacon_filter_control(wvif, 0, 1); @@ -242,11 +242,11 @@ void wfx_configure_filter(struct ieee80211_hw *hw, } if (*total_flags & FIF_PROBE_REQ) - wvif->fwd_probe_req = true; + wvif->filter_prbreq = false; else - wvif->fwd_probe_req = false; + wvif->filter_prbreq = true; hif_set_rx_filter(wvif, wvif->filter_bssid, - wvif->fwd_probe_req); + wvif->filter_prbreq); mutex_unlock(&wvif->scan_lock); } diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h index 53ed4c137b19..3941462097a4 100644 --- a/drivers/staging/wfx/wfx.h +++ b/drivers/staging/wfx/wfx.h @@ -89,7 +89,7 @@ struct wfx_vif { struct work_struct update_tim_work; bool filter_bssid; - bool fwd_probe_req; + bool filter_prbreq; bool filter_beacon; unsigned long uapsd_mask;