From patchwork Wed Jan 15 13:54:24 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: 216620 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.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, 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 7E18AC3F68F for ; Wed, 15 Jan 2020 14:00:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 490DF24656 for ; Wed, 15 Jan 2020 14:00:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="camq1mFN" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729399AbgAONyl (ORCPT ); Wed, 15 Jan 2020 08:54:41 -0500 Received: from mail-dm6nam11on2085.outbound.protection.outlook.com ([40.107.223.85]:14113 "EHLO NAM11-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729335AbgAONyl (ORCPT ); Wed, 15 Jan 2020 08:54:41 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GBsIqiBiA82e762SDIMcmxCafiZWADlND/nZvAMpIFLYGxfyH8NNQyFO6e8Rt6pmpUpiyXCKTAR05ovPZU/KwC3BcMhIh8iY1spMakqdrxPGT9Vx7NJARgMPKKKJgQsocNGsT/kmQIQXx6M9A/KRTk2FniLdK7rSaDFO9fB8omEdipXZm+bCJKsAYQJ6z249Be0Sx/BnyRF+cA0BsxY0pm8J7OhjOSLaf+lRqQmM+DqBcLie97zA/TXyn7aFiJ1Vr28BaSf7vVOtq+VAEPvEb+H64B+0bp33oKLOzDmGwhiZWhEw5uuXZJ44mBepawAJRa9zBZVDtDdBbf5ArDyfgQ== 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=1JtJ2THuxCUky/HiJ4NGgOwKReUaawaehfR0nk8oPx4=; b=gQW09Fdgf4ycuKE/j4AlTq50sPUEMQVUegotTUsC9R8vIztS+3ZcJ6oNGDymOMWbK8f+ZOtEfNOm73tM2KcYudmMMqBGDAVk/6ktFI65cOPVXvYfXUP/E0K7xWi0SFazDVCZlFYdEhqBFklnrPdAwhU86NAZb1BbaLwRJdsmbxyKqv+/pd8Bctdam3CKNhbam8uNM5FBQ26HDTP4wxUNrJRMBAAThQXk2EpilZGy+IiQncczrkg1SOXnER0GMmgxfpdP8kFjqTClAjhzSdH+hZbMcePN9xf2YEX6zeRR64u8s+7H9DliAK910grNf+ppjm1B2hZ9IpZ5qHmyjG8/Og== 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=1JtJ2THuxCUky/HiJ4NGgOwKReUaawaehfR0nk8oPx4=; b=camq1mFNEHGWzFf0+1PIeKKfAxG7AmtDENznJOAX9l8i+vNrHSmGjK61vJHnMQFdIFBAATAiicYIzKhE/lA8xkm4DH585GJ6IWATSoRc8R3kbRQ9RTlHkEFpxYDIU97YwTjx1UTK1mB9shlxNNqbnhuSfvn0leVt6PyoJwtgV+A= Received: from MN2PR11MB4063.namprd11.prod.outlook.com (10.255.180.22) by MN2PR11MB4094.namprd11.prod.outlook.com (10.255.180.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.19; Wed, 15 Jan 2020 13:54:25 +0000 Received: from MN2PR11MB4063.namprd11.prod.outlook.com ([fe80::f46c:e5b4:2a85:f0bf]) by MN2PR11MB4063.namprd11.prod.outlook.com ([fe80::f46c:e5b4:2a85:f0bf%4]) with mapi id 15.20.2623.018; Wed, 15 Jan 2020 13:54:25 +0000 Received: from pc-42.home (2a01:e35:8bf5:66a0:3dbe:4cb5:6059:a948) by PR2P264CA0008.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.18 via Frontend Transport; Wed, 15 Jan 2020 13:54:23 +0000 From: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= 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?SsOpcsO0bWUgUG91?= =?utf-8?q?iller?= Subject: [PATCH v2 16/65] staging: wfx: rename wfx_upload_beacon() Thread-Topic: [PATCH v2 16/65] staging: wfx: rename wfx_upload_beacon() Thread-Index: AQHVy6tLV6TNFz6aKUGZU44vHfJ7Lg== Date: Wed, 15 Jan 2020 13:54:24 +0000 Message-ID: <20200115135338.14374-17-Jerome.Pouiller@silabs.com> References: <20200115135338.14374-1-Jerome.Pouiller@silabs.com> In-Reply-To: <20200115135338.14374-1-Jerome.Pouiller@silabs.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: PR2P264CA0008.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::20) To MN2PR11MB4063.namprd11.prod.outlook.com (2603:10b6:208:13f::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.25.0 x-originating-ip: [2a01:e35:8bf5:66a0:3dbe:4cb5:6059:a948] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 9ff9ee08-318e-4102-70ce-08d799c26e25 x-ms-traffictypediagnostic: MN2PR11MB4094: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2449; x-forefront-prvs: 02830F0362 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39850400004)(366004)(396003)(346002)(136003)(376002)(189003)(199004)(316002)(110136005)(54906003)(85202003)(81156014)(5660300002)(8676002)(71200400001)(8936002)(81166006)(186003)(6506007)(86362001)(66946007)(66446008)(66476007)(66556008)(2906002)(64756008)(478600001)(6512007)(52116002)(66574012)(6486002)(1076003)(16526019)(4326008)(85182001)(107886003)(36756003)(8886007)(2616005); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR11MB4094; H:MN2PR11MB4063.namprd11.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; 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: PHyyUWc/7HCNwLQXISJNp6Y39oF8BptRC9Jhiy92nOWNpI13MWpO28wZX5y5b4Mvw5aQ7bbl6K6LWBqANaW3lVOd0U4rW1xmX4YthbtLX8LnnzflgQiYwx/kKxt/Ta2jc/RPkYlhZ0zis561BnQaCs5fWo/v5orp0H4d17gaZfi977EneTEbRJV71j90gjSYceW/dNV36TGLxLyKmbqvYR+J3csToFb88jHk22ef1DJh6htQsLoMN3Gvi7x/9SuG/2SVn5e/ZTj8baDmnsMUfIu7mQUS8mqDLmpDL5ow0ve9Vt5720K6wolG2RDk38uJHidqE7U9AaJdykFHpaxrPUy1W2Rj3RyLIJbj0He9keKNaWEOE5EpQIUHaK3rN1Hql8l3oIwQ3Gw4Qhwm+c8yPvRJtuNUNDDtSSi2VMJa1/A67gPUgeII2M7D0l/IZPJA Content-ID: <7B7267F6236A404F93A77C3555A1C471@namprd11.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ff9ee08-318e-4102-70ce-08d799c26e25 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Jan 2020 13:54:24.8756 (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: BZHDlFPv2q78CBTC8m1L0A4jHoCGXehlsdREa16gm3u+vM8OLJihEC4T//3Ly3rmYWgfWUy4TKzpBky433ArIQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4094 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 fact, wfx_upload_beacon() uploads beacon and probe response. So, rename it in wfx_upload_ap_templates(). The call to wfx_fwd_probe_req() has nothing to do with template uploading, so relocate it. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/sta.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index 451d0108a1b0..fdde7ab92302 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -780,7 +780,7 @@ static int wfx_update_beaconing(struct wfx_vif *wvif) return 0; } -static int wfx_upload_beacon(struct wfx_vif *wvif) +static int wfx_upload_ap_templates(struct wfx_vif *wvif) { struct sk_buff *skb; struct ieee80211_mgmt *mgmt; @@ -805,7 +805,6 @@ static int wfx_upload_beacon(struct wfx_vif *wvif) hif_set_template_frame(wvif, skb, HIF_TMPLT_PRBRES, API_RATE_INDEX_B_1MBPS); - wfx_fwd_probe_req(wvif, false); dev_kfree_skb(skb); return 0; } @@ -900,7 +899,8 @@ void wfx_bss_info_changed(struct ieee80211_hw *hw, changed & BSS_CHANGED_IBSS) { wvif->beacon_int = info->beacon_int; wfx_update_beaconing(wvif); - wfx_upload_beacon(wvif); + wfx_upload_ap_templates(wvif); + wfx_fwd_probe_req(wvif, false); } if (changed & BSS_CHANGED_BEACON_ENABLED &&