From patchwork Mon Mar 26 17:52:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 10308447 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1FCEE60386 for ; Mon, 26 Mar 2018 17:53:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 12A73295C3 for ; Mon, 26 Mar 2018 17:53:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 079B9297BD; Mon, 26 Mar 2018 17:53:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC614295C3 for ; Mon, 26 Mar 2018 17:53:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752749AbeCZRxK (ORCPT ); Mon, 26 Mar 2018 13:53:10 -0400 Received: from mail-oi0-f67.google.com ([209.85.218.67]:41470 "EHLO mail-oi0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752712AbeCZRxH (ORCPT ); Mon, 26 Mar 2018 13:53:07 -0400 Received: by mail-oi0-f67.google.com with SMTP id 188-v6so354626oih.8 for ; Mon, 26 Mar 2018 10:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GNyIGzhG01T8M2/XC6Bw44iYHsI3vpdDrbZhtXgVW1U=; b=SeowT41pr56RQwOY55754RGH2uvWmue7SzItQisGQdPsMfCqgFKhlSKioDkUbp7z5U z6tONQwAm+W5nYuVUeRqyQ5/qkCkxJBtL9pco3AP1DYUOsa+Nsjit1yJoF9eo/M58Ei/ GdGRwe1MoJ57zq2v4zeEIo67Xl8ntwFG23ORvIkLOGs6bctQPo6Sb1yacnJ4WVsnuVtv tyDE8LxqrBg0i9Esvbk3HV21iHGGRVgkC5oVvGvTSN67kbetXYwQLgOsX+IMgdCUusYq j2rnjg2yM9zloA+IPCkzeQ4TqylcGG64MXE0b3nhZ3c15C5HxLKvG+trcpLIRzAKi5tp km7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GNyIGzhG01T8M2/XC6Bw44iYHsI3vpdDrbZhtXgVW1U=; b=XIqu9AN2BoQNB5fWMfXdPO6T/RlbhYSp/YmFZtm3/qthqWuVtryqwSZ3aEa+XLHafp x2dWrlbPgcx7zvHJQQdXAnlHqCl1lDVjv4+iLKsTjBIWjCLMR9C00M16YUi5UGXEOQm8 zaQDsDkkrC7QPLorvmMHr1uMKx5iHsRXspHlD6o7rVRSien8v81NVhAzEM1zWawgzJuI KFMSnkngX8MzxAqB+S5pSwq22+qfeI3saLumTYKzu5ncrNVtYO8PgwlqoBOg6EyzD7Fy PTBMyGZNYI4yg2DKLd7+9N7ZARnbp65bB66D1STIOy9xoY//kY2KO59OKPDMnpA6oVcz 4G0A== X-Gm-Message-State: AElRT7FuCG+Ki2AdkCJ9pbLkubLH67DvAnrtEnBipj6o2IRfqJ8fNKbP ErN7cCsXwVn/RU6u7dDxEoo+Dw== X-Google-Smtp-Source: AIpwx4+b0VG8ssdtqkRpq+8YoCE2D9sLbU8MTLV5LNa0DUIgZ343MXId1H59DdwhhnRIkiLaMtFb4Q== X-Received: by 10.202.91.5 with SMTP id p5mr3154250oib.122.1522086787038; Mon, 26 Mar 2018 10:53:07 -0700 (PDT) Received: from new-host-2.home (cpe-70-114-247-242.austin.res.rr.com. [70.114.247.242]) by smtp.gmail.com with ESMTPSA id t1-v6sm9112952oth.75.2018.03.26.10.53.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Mar 2018 10:53:06 -0700 (PDT) From: Denis Kenzior To: linux-wireless@vger.kernel.org Cc: Denis Kenzior Subject: [PATCH v7 09/11] nl80211: Add control_port_over_nl80211 to mesh_setup Date: Mon, 26 Mar 2018 12:52:49 -0500 Message-Id: <20180326175251.20666-10-denkenz@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20180326175251.20666-1-denkenz@gmail.com> References: <20180326175251.20666-1-denkenz@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Denis Kenzior --- include/net/cfg80211.h | 3 +++ net/wireless/nl80211.c | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 2a28f446648e..bdb1a3c2661e 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -1453,6 +1453,8 @@ struct mesh_config { * @userspace_handles_dfs: whether user space controls DFS operation, i.e. * changes the channel when a radar is detected. This is required * to operate on DFS channels. + * @control_port_over_nl80211: TRUE if userspace expects to exchange control + * port frames over NL80211 instead of the network interface. * * These parameters are fixed when the mesh is created. */ @@ -1475,6 +1477,7 @@ struct mesh_setup { u32 basic_rates; struct cfg80211_bitrate_mask beacon_rate; bool userspace_handles_dfs; + bool control_port_over_nl80211; }; /** diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 774f5d6ba8e4..3947ec7bc3a0 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -10166,6 +10166,15 @@ static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info) setup.userspace_handles_dfs = nla_get_flag(info->attrs[NL80211_ATTR_HANDLE_DFS]); + if (info->attrs[NL80211_ATTR_CONTROL_PORT_OVER_NL80211]) { + int r = validate_pae_over_nl80211(rdev, info); + + if (r < 0) + return r; + + setup.control_port_over_nl80211 = true; + } + err = cfg80211_join_mesh(rdev, dev, &setup, &cfg); if (!err && info->attrs[NL80211_ATTR_SOCKET_OWNER]) {