From patchwork Fri Apr 10 13:32:35 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: 1269084 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=209.132.180.67; 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=k8+c/z0o; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48zJr56bByz9sTG for ; Fri, 10 Apr 2020 23:33:41 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727003AbgDJNdj (ORCPT ); Fri, 10 Apr 2020 09:33:39 -0400 Received: from mail-dm6nam12on2089.outbound.protection.outlook.com ([40.107.243.89]:6130 "EHLO NAM12-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726942AbgDJNdh (ORCPT ); Fri, 10 Apr 2020 09:33:37 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YovpcFmK+jDED1+e8G3SuGO/x0Ar4eLUBT3w7a5k0W0JIZl35wGdx2Wws9et4T5gVYtBorguFMcxFT6BtOJoYNan70BZD7awEqmnaaPcc56sP7q8zK9srlY99vZb6XyMzBASQxrcTe7NIrqUuXzj6kUzs/8Os4RX78ciHdJbF/7Gll0fKJ9YyBJoJQgZaxNajrSDADpCab7uuMZK/TtSwtdrC3ochSfcc5O8e3ZS3j2YDhe8dzOKqpl5Bu+y4UDiw2TWBWMRepIles2Wsl0ugOvfhe888DsDD+NR6cwrLcubu2VPNBjJqfEqwRXXrLEzd2q2b3VxmTvgxmL9nSpioQ== 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=Ytj3KOj2uc2Jm0eD6M5bgseZ83ZtTsywRSkzRnUx7fA=; b=M34BdCQlRoSF5JHJ5ZCO3d9ADLOTvsBi0Vm7fpxgOJ8sFvZemdX5pIJtI1ZRrfsrME+yAtyzPtvziSjFHCg5S0YP402R58W/0KIiEPKFT8ZCn3YYsoJAwNDlP7lce76HN1fcWckPAmO7biGmecUpaD1KgbiCjcEpR0rT4eGI8poJdHTofFETsJkqiGmGaXxkTKboyUMOKkV1qv7QpwrwaK7HdEEaejseSW3Svu3IIrfdPIzBL7XbyOtwjJlBB6RJZ2ZMAVZ3GNRtb67aCV5BLguT8Gt0smO09KzwWq7adwQMrWm1fPbJoFmLClgOOPS3n89Ldjgg6QKU2kJ01U+E0A== 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=Ytj3KOj2uc2Jm0eD6M5bgseZ83ZtTsywRSkzRnUx7fA=; b=k8+c/z0o1Hs1brlqC5GGCUwP2tGD9aXpZbhQe4xttVTZyhsPTFrJALh30FDTOi/nKLeJq3XDd1I568tALzk7n3avoGR67Qm/zL5bSCsXB16QZcXAW2N6jJDuG8IaRm6rtBWJRrbWAG48f352CJctXlL11gEmJuilauD5dKqNR4c= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerome.Pouiller@silabs.com; Received: from MN2PR11MB4063.namprd11.prod.outlook.com (2603:10b6:208:13f::22) by MN2PR11MB4398.namprd11.prod.outlook.com (2603:10b6:208:18b::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2878.20; Fri, 10 Apr 2020 13:33:27 +0000 Received: from MN2PR11MB4063.namprd11.prod.outlook.com ([fe80::3d0a:d9ac:3df4:8b1]) by MN2PR11MB4063.namprd11.prod.outlook.com ([fe80::3d0a:d9ac:3df4:8b1%6]) with mapi id 15.20.2878.021; Fri, 10 Apr 2020 13:33:27 +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 15/19] staging: wfx: introduce wfx_join_ibss() and wfx_leave_ibss() Date: Fri, 10 Apr 2020 15:32:35 +0200 Message-Id: <20200410133239.438347-16-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200410133239.438347-1-Jerome.Pouiller@silabs.com> References: <20200410133239.438347-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: DM5PR15CA0056.namprd15.prod.outlook.com (2603:10b6:3:ae::18) To MN2PR11MB4063.namprd11.prod.outlook.com (2603:10b6:208:13f::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.silabs.com (2a01:e35:2435:66a0:1265:30ff:fefd:6e7f) by DM5PR15CA0056.namprd15.prod.outlook.com (2603:10b6:3:ae::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2900.15 via Frontend Transport; Fri, 10 Apr 2020 13:33:25 +0000 X-Mailer: git-send-email 2.25.1 X-Originating-IP: [2a01:e35:2435:66a0:1265:30ff:fefd:6e7f] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a8496dd1-fdda-4a50-8650-08d7dd53c02c X-MS-TrafficTypeDiagnostic: MN2PR11MB4398: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2201; X-Forefront-PRVS: 0369E8196C X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR11MB4063.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(10009020)(366004)(346002)(396003)(136003)(39850400004)(376002)(107886003)(81156014)(54906003)(8676002)(86362001)(1076003)(6666004)(8936002)(4326008)(52116002)(7696005)(316002)(66556008)(66946007)(186003)(478600001)(2906002)(6486002)(2616005)(66476007)(16526019)(5660300002)(36756003); 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: hQPcOTnZhT4LOIS94SrGr7jvuWLmURWyjDY4jpMO8O2vVpJlflPrkK2UJQmGSMLcpMo3KMOUenZohQPHDmXaZSkq5hXroR9Rml+q+gjDQg+QQq9Y0gix/6Om6FKnUuDBQ+3ZCY1Nvv/KZUOkAeDrMALlJ8GBoEmG1Wo4KB6GySwOJJS4GAFz7kvMLj8tmKI0gvTfEpwogVttZeIC1JtfDAmkJOIvxcXF5uDp6MrCUSJ/PfNE/BIANf3k/x+3sD22NcfPwV26oz0fVjcXUQAzTuhDviRPvVDTsYMioBxPZ8ic14RUwnBC5fkiz6YHD5dz0695Akxk9LkT4jqOmAN7oiWXlXLBa+wsW8kJEgL81ou9H4QN/9FyXmWvu6waBNp5ec07A1PQT5pDxH9I4INounhQNIw0aZuRmzZ21gzlJgZH4AKbeCTTwf9KqVtISFTD X-MS-Exchange-AntiSpam-MessageData: n+1S+o2lwdYyil3Ipv1JhpxHi90znPTozGfUU3o/6+Re7WgUHXwN3YpP1ukTUxUbiifzw5KD/EP945J9H6tVpYVtBLvIIStRBDnKHXA0oebpXU6wv1i1QmqnqAZQT5yfNfZIl28nZhfDVPxqTrllTiD87BU/eFpNQdlPuvHxS2fgPt+fMF2YiXd3TfInwCtOHbDfa9WSgP9uBFfQwkz+9Q== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8496dd1-fdda-4a50-8650-08d7dd53c02c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2020 13:33:27.5260 (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: cHzcjHlQCMsxMWVA+paQK5mO/Oz3T0Jx+yQT9QgCvgRYGqPc7pMuxY4k0vAzjrJB12nzDDgIYExlXkqULJkbdQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4398 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller Currently, IBSS networks are started by the mean of wfx_bss_info_changed(). It easier to use use callbacks provided by mac80211. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/main.c | 2 ++ drivers/staging/wfx/sta.c | 19 +++++++++++++++++-- drivers/staging/wfx/sta.h | 2 ++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wfx/main.c b/drivers/staging/wfx/main.c index b459fac928fd..b8a01ba0d381 100644 --- a/drivers/staging/wfx/main.c +++ b/drivers/staging/wfx/main.c @@ -133,6 +133,8 @@ static const struct ieee80211_ops wfx_ops = { .remove_interface = wfx_remove_interface, .config = wfx_config, .tx = wfx_tx, + .join_ibss = wfx_join_ibss, + .leave_ibss = wfx_leave_ibss, .conf_tx = wfx_conf_tx, .hw_scan = wfx_hw_scan, .cancel_hw_scan = wfx_cancel_hw_scan, diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index 8aa373f5deae..21eceafc9a95 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -648,6 +648,22 @@ static void wfx_join_finalize(struct wfx_vif *wvif, } } +int wfx_join_ibss(struct ieee80211_hw *hw, struct ieee80211_vif *vif) +{ + struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv; + + wfx_upload_ap_templates(wvif); + wfx_do_join(wvif); + return 0; +} + +void wfx_leave_ibss(struct ieee80211_hw *hw, struct ieee80211_vif *vif) +{ + struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv; + + wfx_do_unjoin(wvif); +} + void wfx_enable_beacon(struct wfx_vif *wvif, bool enable) { // Driver has Content After DTIM Beacon in queue. Driver is waiting for @@ -688,8 +704,7 @@ void wfx_bss_info_changed(struct ieee80211_hw *hw, if (changed & BSS_CHANGED_BASIC_RATES || changed & BSS_CHANGED_BEACON_INT || changed & BSS_CHANGED_BSSID) { - if (vif->type == NL80211_IFTYPE_STATION || - vif->type == NL80211_IFTYPE_ADHOC) + if (vif->type == NL80211_IFTYPE_STATION) wfx_do_join(wvif); } diff --git a/drivers/staging/wfx/sta.h b/drivers/staging/wfx/sta.h index 6a4b91a47f5b..3002d89dc871 100644 --- a/drivers/staging/wfx/sta.h +++ b/drivers/staging/wfx/sta.h @@ -56,6 +56,8 @@ int wfx_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif); void wfx_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif); int wfx_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif); void wfx_stop_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif); +int wfx_join_ibss(struct ieee80211_hw *hw, struct ieee80211_vif *vif); +void wfx_leave_ibss(struct ieee80211_hw *hw, struct ieee80211_vif *vif); int wfx_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue, const struct ieee80211_tx_queue_params *params); void wfx_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,