From patchwork Wed Jan 15 12:12:30 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: 216653 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 CBF0DC33CB1 for ; Wed, 15 Jan 2020 12:18:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 98D50207FF for ; Wed, 15 Jan 2020 12:18:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="OoQqwSqy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730718AbgAOMMn (ORCPT ); Wed, 15 Jan 2020 07:12:43 -0500 Received: from mail-co1nam11on2084.outbound.protection.outlook.com ([40.107.220.84]:24056 "EHLO NAM11-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730407AbgAOMMl (ORCPT ); Wed, 15 Jan 2020 07:12:41 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xw1T0HiQfGYPJ0UOUZHp46Yhq8QtNXvUNV+6tpTxgKIvG5XaOFs9v6cvrNBFVhX5/LTm26JRKeK3gbKxVMYU4Vh6rXpfkVRTKrzrlX8eo5OJyJ/yDwdY+UJ8sIIduvU4zypqptxtIv9s9/+IdNon3eFM1LD3XCAxOVo66qCIrVlA70aWZWadKz42QkAbwsXdAk06HuHcs0WsLB4Lqd1e7LV5MZv7TFZAcqgiaUlJ67fiZmJ6AaEIWOhaO7MNb27HY3C56syHaM0GammuRtfHeMwH9hpQXust8rEp9pxLXEZq79MSW1D0h0OZLD1N3Lth95Fgur4G4Xuv30+FuEUZPQ== 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=J3wxdf1RiHtVEV7wOzGjO0AW7bUf36rRjYj973jLAzqQUC74J45Qd5ozyeGOxVy9WjYHr1FzyuhmktToz70nVwnxbtRupMN5VHCjRxyxqVj628NMfvBvYSjOhF89h+Pfr8q+sqzJatps3B6xS5RwRlFwyujK7XsYAptM5ZV+b7VaMdS5bTLr8abqv7HnLMWrRtEar3jCopRQIVjHMExAunz99wob51/99TJhmNGffo+a/K9eVhCtwlN0EcEuPmtjHT7QNiegGyyH+n+yTtQHrL1qR9+KY6/yPe+kXQwawhIRqH59wJAkIpOKtQk/DUcYHYFKS97AURX/iWAkvOEuqQ== 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=OoQqwSqyzzcjcaj1gpOZ4Xam6oDjzDVSuRd0QqR7lNKTHkrv8UPQcl5+5Ua3wg6eQW+1uvjI72nTCpR7Gw2q80J6tVbYzmNsp3qCAmqAKqNvfNnPE/vq3fYt5hdB/q4mC8WlI//L91BI3abOBrdLUDodDi2lBKXDDPqQ3xx4Brk= Received: from MN2PR11MB4063.namprd11.prod.outlook.com (10.255.180.22) by MN2PR11MB3934.namprd11.prod.outlook.com (10.255.180.212) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.20; Wed, 15 Jan 2020 12:12:30 +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 12:12:30 +0000 Received: from pc-42.silabs.com (37.71.187.125) by PR2PR09CA0009.eurprd09.prod.outlook.com (2603:10a6:101:16::21) 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 12:12:29 +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 16/65] staging: wfx: rename wfx_upload_beacon() Thread-Topic: [PATCH 16/65] staging: wfx: rename wfx_upload_beacon() Thread-Index: AQHVy50PpJG7UY/aIUKTSlWUlo6u3w== Date: Wed, 15 Jan 2020 12:12:30 +0000 Message-ID: <20200115121041.10863-17-Jerome.Pouiller@silabs.com> References: <20200115121041.10863-1-Jerome.Pouiller@silabs.com> In-Reply-To: <20200115121041.10863-1-Jerome.Pouiller@silabs.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: PR2PR09CA0009.eurprd09.prod.outlook.com (2603:10a6:101:16::21) 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: [37.71.187.125] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d308cfb6-fb06-4a8f-822c-08d799b431cd x-ms-traffictypediagnostic: MN2PR11MB3934: 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)(396003)(136003)(376002)(366004)(346002)(199004)(189003)(54906003)(110136005)(86362001)(956004)(107886003)(2616005)(316002)(36756003)(71200400001)(52116002)(7696005)(478600001)(8936002)(81156014)(8676002)(4326008)(81166006)(6486002)(2906002)(26005)(66946007)(16526019)(186003)(5660300002)(66574012)(1076003)(66556008)(64756008)(66446008)(6666004)(85182001)(66476007)(85202003); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR11MB3934; H:MN2PR11MB4063.namprd11.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: EsqIws3pe/dzwK9AEElHLSS+954zpeYXabz8fdWpm2aeG9iWftcQ9YqjKn2y7OkfwftNIZ7AbF4nGwJR/uH3vT7KC7p4qYRa9aDZaihC7cLJndS5Jo5pOGstj2oecjupmrQHMFl53UO+D6WPO5bgxhQFsRWKvyhLoz79ik4zHcab+z4RAGcYL6+Jcf9QhAINKiXmKuj+caK8oxyfmbB2r+SgdtGWfncPrVNU4z73G+ejCicUIEYxzxzrRUPigFIz3rQUnSU9NTvp9xPXXyDhIDO0kqXLiUK2pkdpM4p5VCq4JkQMbvfm8Vxg2OK+sACihcLw+KQlWWPCTR92ZUBc0sVX2tJpas7rhbAmHkpJGVH9OwheXLIdx9wKzZ3mLyIAOXattz0nkAyFPqioJ5J+ykqg35tN6AtguIdGwlVI8eFZGnB2bxatLRIUZl+EQ0q+ Content-ID: <7AB41A9B60CBFF43A7E2AFE1C4A0CAB7@namprd11.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: d308cfb6-fb06-4a8f-822c-08d799b431cd X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Jan 2020 12:12:30.6748 (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: CM7ejtR+vjnN+tT3VwpqDPRw2LsXewybbCvt1Qo6YUwE48CepMq+kIRtklomo5JRQrWhY0TaErqxDHXrAL5oug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB3934 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 &&