From patchwork Mon Mar 26 17:52:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 10308453 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 8D37160386 for ; Mon, 26 Mar 2018 17:53:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 810CF295C3 for ; Mon, 26 Mar 2018 17:53:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 760ED297BD; Mon, 26 Mar 2018 17:53:17 +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 1553C295C3 for ; Mon, 26 Mar 2018 17:53:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752726AbeCZRxI (ORCPT ); Mon, 26 Mar 2018 13:53:08 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:35736 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751908AbeCZRxG (ORCPT ); Mon, 26 Mar 2018 13:53:06 -0400 Received: by mail-oi0-f65.google.com with SMTP id x20-v6so16586637oie.2 for ; Mon, 26 Mar 2018 10:53:06 -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=ozSScjKJy26OU4qQ7rg5tSl+S5AZLbwHbcxhR83Z+ro=; b=XF6wo+FNykHN9WgOKM3HEt6nV1bHbitoz463WQ0sMj69jpyBOCuHnzYUDNPzs+0WXz 5FzlLagmz8fyuDbu9ALsfe6uRRUkhlnBOYegdMHvZJjkyq6OyNjnfSXvogeKC8j2cy/c eH5Xo6puRdZQnklp6evqj5cfYfiEYhHYzcJlUlePmawgwPj7B2KgoXBjdSoG7D2zljE+ 55KmY1uS9OyO6a6yO+801N5iXMuA9/GwCH4NbDw0BWtIOjVIjtyLPaMJAh/LQvd1WJYz IDIkpCZ0Jwlu1ZHCpStvdujXnHp4J92yjtkCfKtDApULgjfJKeow8FfABJzRPB9nFb2P T1+g== 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=ozSScjKJy26OU4qQ7rg5tSl+S5AZLbwHbcxhR83Z+ro=; b=AeQjVEVCgacGFP4764+eil56aJaJHTf5kD9LXAfJXHehyQozTvvcaB/rVQOYJ0DjEA aqy2m3lzeaVcIA+rl7v216h+zYbj4ZKtVkXvHz092dIWb9L6sohL3dZFR/ISZ5gGxRim UagRg1ggmK8kQsXIpzNmiHioIGw9GAUIMUMs+phwu2z46Z8gVD1VQrIlyfs2ysX2GnZk 99GxUHnSLKAdHbhEgkZN5msq0N0GikHU105kQQ7ezjJgzQvT+pBFM+Tj70DV6ML673BJ 4BBWYzxCo7kvo1JFxb0b5nfRshfi/95KbQUqbDCsN+BebyxrH7MUYp1JPkLI/h9BpVX9 2E7A== X-Gm-Message-State: AElRT7E2buXl/qeFrOVaUnQbmsjnIjBAb8GsqBtuC1XtA5MtsuOCyCd4 Yib5A0aEu9Nrt8V9fed65maAKg== X-Google-Smtp-Source: AG47ELuFKHqxY0MP6oKlm90A7/oHmYzwz+Mxr0iML1Wld1WXH+rl+RFdYxfg5uNzvt4GSv+llX4K9g== X-Received: by 10.202.229.11 with SMTP id c11mr22242888oih.193.1522086786129; Mon, 26 Mar 2018 10:53:06 -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.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Mar 2018 10:53:05 -0700 (PDT) From: Denis Kenzior To: linux-wireless@vger.kernel.org Cc: Denis Kenzior Subject: [PATCH v7 08/11] nl80211: Add control_port_over_nl80211 for ibss Date: Mon, 26 Mar 2018 12:52:48 -0500 Message-Id: <20180326175251.20666-9-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 2e7f30c66913..2a28f446648e 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -2033,6 +2033,8 @@ struct cfg80211_disassoc_request { * sets/clears %NL80211_STA_FLAG_AUTHORIZED. If true, the driver is * required to assume that the port is unauthorized until authorized by * user space. Otherwise, port is marked authorized by default. + * @control_port_over_nl80211: TRUE if userspace expects to exchange control + * port frames over NL80211 instead of the network interface. * @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. @@ -2056,6 +2058,7 @@ struct cfg80211_ibss_params { bool channel_fixed; bool privacy; bool control_port; + bool control_port_over_nl80211; bool userspace_handles_dfs; int mcast_rate[NUM_NL80211_BANDS]; struct ieee80211_ht_cap ht_capa; diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 34e8435f0c43..774f5d6ba8e4 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -8702,6 +8702,15 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info) ibss.control_port = nla_get_flag(info->attrs[NL80211_ATTR_CONTROL_PORT]); + if (info->attrs[NL80211_ATTR_CONTROL_PORT_OVER_NL80211]) { + int r = validate_pae_over_nl80211(rdev, info); + + if (r < 0) + return r; + + ibss.control_port_over_nl80211 = true; + } + ibss.userspace_handles_dfs = nla_get_flag(info->attrs[NL80211_ATTR_HANDLE_DFS]);