From patchwork Wed Apr 15 16:11:46 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: 1271295 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=fjb8QMtC; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 492S874W5Fz9sT6 for ; Thu, 16 Apr 2020 02:13:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1415309AbgDOQNX (ORCPT ); Wed, 15 Apr 2020 12:13:23 -0400 Received: from mail-bn8nam12on2054.outbound.protection.outlook.com ([40.107.237.54]:6138 "EHLO NAM12-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1415283AbgDOQNK (ORCPT ); Wed, 15 Apr 2020 12:13:10 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q1E0cEk98TzceWzFUJar17EXYgo4v9EbquiufJxHRByZ0osB3pAcUwCghW1MJN8DMrngE/VIQwtmGE8Pz/ckZ/0TsTPELLjqBNW3hqVKzdvIqA56+Y2LH311DpUfCleUY2fceiHIOUY2by2vVhw5yxkcIIpxGDjSoWWlexljNDn9w5F+zpqwfrCD5CK+FbTQVED5ianxxVGXvfrz72nqyXO8fE/Oi98IFsQajHaL9/AwWAMCJR3uRlkdZD9Ztu+74Tpk/UwTKftSALuJmtvd8FnR8mLLfscpon+2H2EX0bhtVyG5nUxMjoXOWGs0X8JQ6JR+JQYnZx54d/ygQIL02Q== 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=UsbkUgcUeGdRTqhef3y/aDNfj8Oubyo7xIeAbS3xLSs=; b=gKHAiZHoB/GcZpWsN+2tX44eLmkSjoDmfFnw4eXI6cZcmTlbRIrNX2koJ1zj/NvE2kbxgB2NHy0NU62de9f9f9CPRx31bywGF3JUIgUOv1fOUTsM/S3G+DcVw64swz2WXC0a5GcdVl/LLPzZQmtvevfqCXiqwvQE08Chrqp4nnvbg+aMToP5VfQPx1At1RlYoMUzfgP2PV6opIevr/jjBIlxxHGd38SL3uUVWMd1CZsUlYd9zSSQJ5XcwxVgLN+9KWmNGkBnSYT0yGGvFJuTV+wjpy58fVHEllXNmlawsDJDQnI/bLj/kM3HdDB3I0XLQaJN9wp5ErEUwveYMGzqAg== 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=UsbkUgcUeGdRTqhef3y/aDNfj8Oubyo7xIeAbS3xLSs=; b=fjb8QMtCVfcXDuPVp9HwY8uzuOdRar+D8R+jtFcs+/RVDeL7ORC6RszMJUW/beqLEjOoRdotaijoWs8tM5tgonJt+Gx+D8qT1aSD6n1gtGTDNMeekfZSBBIRjhvbfcO0r1NfVAhoY6FRvPAaoI0Igx9bVx06oJ7fL9cJvcZMMTU= 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 MWHPR11MB1327.namprd11.prod.outlook.com (2603:10b6:300:2a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2900.15; Wed, 15 Apr 2020 16:13:01 +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:13:01 +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 19/20] staging: wfx: drop useless attribute 'filter_mcast' Date: Wed, 15 Apr 2020 18:11:46 +0200 Message-Id: <20200415161147.69738-20-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:59 +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: 653e8c42-c6e2-409e-9708-08d7e157de7c X-MS-TrafficTypeDiagnostic: MWHPR11MB1327: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; 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)(39850400004)(136003)(346002)(366004)(376002)(396003)(4326008)(81156014)(107886003)(52116002)(54906003)(8676002)(478600001)(8936002)(6506007)(5660300002)(6512007)(36756003)(8886007)(86362001)(316002)(6486002)(1076003)(2616005)(186003)(2906002)(66574012)(6666004)(66556008)(16526019)(66946007)(66476007);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: IbMqQ+lEiGZsEiHsxPBYsdJbSNhq+8Ai4xGEydt9Yxmnd9cP940JKzIdAaIopnmY/Oj1Wy4ngom47tzl+Sk3IAi8KMCGuhfDr9tQJrI8FwlYNLXjPl8bVn7wvlrvamdRJSb01QSwmJpo/DTknxM2l1i80Wlp1y5NJS5pNnUry4ckorMW3CLtOBdnfsCjOI7uSvAKtE+1hjGkK9FMcJaTYqBE3vV/Y/awJXP2wRRULg/YVX0Na/pFPRt4/QcybBloSEd4RpSoZgQ9zN2jb//TwUPR2ftQiIXRdjCT/gbYygMrvV+KdV+Vesua6piQFzJnhFiHLvmc5vnIuzuxMjw+3yGuH2K3VX0KdiMxhPfoQYKsUBd5NBbxtj6glHNtkBrABNCudInB3gK1wWmMM1uyC7oawQAqMnFk0SJb0e+yJiSCjciK3xKNEXT7WlLuv3vJ X-MS-Exchange-AntiSpam-MessageData: /TQTZLruHrb9A2XwDLiNWnFTYum4zpLO/3Dvma4q3otY/Y2LMEI1yQ3HvB+wKknQOWZj/bYGMzWgZ/Sc02Nzcm4V2A2fpH/o+6d5R1IyH+cc6wcZxFo1oGQKgTCmJWwF1qi8Wp08pd9IuZUFNbE0yKOSILJk8oHzJTyCx4bupyhtaEDL/gGXlg7pyT9h8ej+U1b9ORmS3SpkCBkGhmXTmg== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 653e8c42-c6e2-409e-9708-08d7e157de7c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2020 16:13:00.9674 (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: d7ntAbVaNDycO62Q4VYLi1ljJqyQxGoAkPs4siUtoaPLFiLabIVlP4KQR0HgUCxFG6a9IZlJ9QEf9FrmiUDwYA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1327 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller Currently, wfx_update_filtering() apply the value of wvif->filter_mcast to the hardware. But an attentive reader will note that wfx_update_filtering() is always called after set wvif->filter_mcast. Thus, it not necessary to store filter_mcast in the struct wfx_vif. We can just pass it as parameter. Also rename wfx_update_filtering() in wfx_filter_mcast() to reflect this change. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/sta.c | 14 +++++++------- drivers/staging/wfx/wfx.h | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index 69a5823af284..c73dbb3a0de8 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -144,7 +144,7 @@ static void wfx_filter_beacon(struct wfx_vif *wvif, bool filter_beacon) } } -void wfx_update_filtering(struct wfx_vif *wvif) +static void wfx_filter_mcast(struct wfx_vif *wvif, bool filter_mcast) { int i; @@ -152,7 +152,7 @@ void wfx_update_filtering(struct wfx_vif *wvif) hif_set_data_filtering(wvif, false, true); return; - if (!wvif->filter_mcast) { + if (!filter_mcast) { hif_set_data_filtering(wvif, false, true); return; } @@ -198,7 +198,7 @@ void wfx_configure_filter(struct ieee80211_hw *hw, { struct wfx_vif *wvif = NULL; struct wfx_dev *wdev = hw->priv; - bool filter_bssid, filter_prbreq, filter_beacon; + bool filter_bssid, filter_prbreq, filter_beacon, filter_mcast; // Notes: // - Probe responses (FIF_BCN_PRBRESP_PROMISC) are never filtered @@ -223,14 +223,14 @@ void wfx_configure_filter(struct ieee80211_hw *hw, wfx_filter_beacon(wvif, filter_beacon); if (*total_flags & FIF_ALLMULTI) { - wvif->filter_mcast = false; + filter_mcast = false; } else if (!wvif->filter_mcast_count) { dev_dbg(wdev->dev, "disabling unconfigured multicast filter"); - wvif->filter_mcast = false; + filter_mcast = false; } else { - wvif->filter_mcast = true; + filter_mcast = true; } - wfx_update_filtering(wvif); + wfx_filter_mcast(wvif, filter_mcast); if (*total_flags & FIF_OTHER_BSS) filter_bssid = false; diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h index c30e6984aec1..b5d2d0f07740 100644 --- a/drivers/staging/wfx/wfx.h +++ b/drivers/staging/wfx/wfx.h @@ -89,7 +89,6 @@ struct wfx_vif { int filter_mcast_count; u8 filter_mcast_addr[8][ETH_ALEN]; - bool filter_mcast; unsigned long uapsd_mask; struct hif_req_set_bss_params bss_params;