From patchwork Mon Mar 26 17:16:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 10308323 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 EB6E560212 for ; Mon, 26 Mar 2018 17:16:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB13E29162 for ; Mon, 26 Mar 2018 17:16:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF477297A7; Mon, 26 Mar 2018 17:16:30 +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 6FF9829162 for ; Mon, 26 Mar 2018 17:16:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752622AbeCZRQ3 (ORCPT ); Mon, 26 Mar 2018 13:16:29 -0400 Received: from mail-ot0-f193.google.com ([74.125.82.193]:46555 "EHLO mail-ot0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752116AbeCZRQ1 (ORCPT ); Mon, 26 Mar 2018 13:16:27 -0400 Received: by mail-ot0-f193.google.com with SMTP id v64-v6so326260otb.13 for ; Mon, 26 Mar 2018 10:16:27 -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=uLgBHddTkHFGfh/pmbkMHq4lqUOr4Y19oZcu0x6sz8w=; b=VDnCWw0aigtvVF7hkgnXwUzigZ4A26nna+dwZdOJUEjWx1V6BJzIsAF3KwFOeKuMYm jbwU/5B97NsxwBtj5mexI7o3FWSYbmjN4n3v8+wE8c/xb0m9nuoPQhKkcz8xrlkAdCXq iRoLcARK1CEBQ5IPgRVjQvM1zPJab6ZwXqgdqlfjVgHexIBDtKEQb0uqF2ETo25b1K6X iy0orTINWc/kJXeMDpbq/UfGrDnfm5/f3lxEfIANcfGA4umIT0+/wcOm1Z41sV90jECO RIc06dC93IpD2sflpqrZR5oNdlxEuNJ9v3MhCqZF33IcyWJaJ1VUElF3ie4WD1kTLyV4 YMcg== 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=uLgBHddTkHFGfh/pmbkMHq4lqUOr4Y19oZcu0x6sz8w=; b=jb9Vcl7aJ3foQL0Lx+BKxz0/IHAwIOEZz+y8RX0eGiagZhT1f/pI4ejLzSjKdZpwY7 HZgUf1ao7cedqRplbNe2Gixf9uoboOJ5whJ8pGNxyVI3ULnk7UthTMiAFouTvnO+iKkC 5Ccp8ofAovt7G8p9M29fU/yOTfZnLj2uApZyfu9+BZ5yZC9I4VHDqNwJO3NSbWDu8IQM w34OM0SJI6tbvgMKm0+5ftXF49lHM5ux6+ZaOnuHVzMsuKq6+OngxO4gsH3osRmoEQjm nIIyQ++yc+4szVMrh4h0haaGKJ0EQGn4wGUOYbopX9lYNU/FS6JwvFG9XtlwoceuQ5uf W2kw== X-Gm-Message-State: AElRT7HDSikwI98w9Rd56KlcEAyRsaxQUOMKrrYTm9x/k0D1FSQMI7Z/ t0B7hVdvvDmKpTxXZXcsqtQp6Q== X-Google-Smtp-Source: AG47ELtNdGzucYtOOd70nwz7WbrnBVcy8IdfGIEZ/0P+nmu+uQHFy7SWm7aRbFCUQjLJqdR56mkB1Q== X-Received: by 2002:a9d:38a2:: with SMTP id p31-v6mr20595138otc.299.1522084586868; Mon, 26 Mar 2018 10:16:26 -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 c3-v6sm9426996otk.8.2018.03.26.10.16.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Mar 2018 10:16:26 -0700 (PDT) From: Denis Kenzior To: linux-wireless@vger.kernel.org Cc: Denis Kenzior Subject: [RFC v6 05/11] nl80211: Add SOCKET_OWNER support to JOIN_IBSS Date: Mon, 26 Mar 2018 12:16:08 -0500 Message-Id: <20180326171614.20373-6-denkenz@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20180326171614.20373-1-denkenz@gmail.com> References: <20180326171614.20373-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/uapi/linux/nl80211.h | 2 ++ net/wireless/ibss.c | 1 + net/wireless/nl80211.c | 6 ++++++ 3 files changed, 9 insertions(+) diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 1cdac3d732c1..877fab2836ec 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -1985,6 +1985,8 @@ enum nl80211_commands { * multicast group. * If set during %NL80211_CMD_ASSOCIATE or %NL80211_CMD_CONNECT the * station will deauthenticate when the socket is closed. + * If set during %NL80211_CMD_JOIN_IBSS the IBSS will be automatically + * torn down when the socket is closed. * * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is * the TDLS link initiator. diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c index a1d10993d08a..d5d26fc5b853 100644 --- a/net/wireless/ibss.c +++ b/net/wireless/ibss.c @@ -224,6 +224,7 @@ int __cfg80211_leave_ibss(struct cfg80211_registered_device *rdev, if (err) return err; + wdev->conn_owner_nlportid = 0; __cfg80211_clear_ibss(dev, nowext); return 0; diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 234f6a41aa03..2f630ee3240b 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -8704,6 +8704,12 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info) err = cfg80211_join_ibss(rdev, dev, &ibss, connkeys); if (err) kzfree(connkeys); + else if (info->attrs[NL80211_ATTR_SOCKET_OWNER]) { + wdev_lock(dev->ieee80211_ptr); + dev->ieee80211_ptr->conn_owner_nlportid = info->snd_portid; + wdev_unlock(dev->ieee80211_ptr); + } + return err; }