From patchwork Tue Mar 13 21:59:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 10281009 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 D36E56038F for ; Tue, 13 Mar 2018 22:00:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1F372821F for ; Tue, 13 Mar 2018 22:00:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B6A2028536; Tue, 13 Mar 2018 22:00:16 +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 5E0C42821F for ; Tue, 13 Mar 2018 22:00:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753098AbeCMWAP (ORCPT ); Tue, 13 Mar 2018 18:00:15 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:44186 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752636AbeCMWAA (ORCPT ); Tue, 13 Mar 2018 18:00:00 -0400 Received: by mail-pf0-f196.google.com with SMTP id m68so484333pfm.11 for ; Tue, 13 Mar 2018 15:00:00 -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=Jw0JhuTzF4FMEoYcjQgXP48IjzrRPvoQnimgmzQflVg=; b=Loe+GFdzTnUYVQWSloZXTIuBhE6vC1Cs18ky/TAdtGhYmlRc4RrfKXgYreJq0AZmiM o66YByT8LmkdNDJwQTeTIzEdOhP6UH17QpxzfRs6B+hyFDr+t9MIQrR9Js9GBabgpN4o tjQkaZJlx1PkOALZzAAJnhhA9WoVqd2bHJe7K3SpTDHepx/rFj9+Zy+oOcLXdmw7lYh7 pjRB3iG4AwHOE5gbwjDq0yhlps/T9HhPv86K1Vp4L9Py6e0WStVx9pVmJDS+v5tmRhnI AyfIyzvIpwzZYu/LhwggbTMA8hVS/2tEiuguhI2nmV+H8RVGYcje0CD6L/Tcxwk2NAP1 9bQg== 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=Jw0JhuTzF4FMEoYcjQgXP48IjzrRPvoQnimgmzQflVg=; b=aay+NGxfug+QziHy0/StDOOO2eoXMfFaL7Lo5jv1UNrHadIOGR52USZA65j1Qfed3C t0cL5MLqhOgofj4n/sGvU8CeNWjOojXnFUmDtnaqU7AHpMxjynLvhsTCWEsmXyN/NCSZ ZOdHD1L4BaN+Yp8tUmTXpfbmPy5+9PUs+coWpQHDwSCS3g+moRu4J0Iyosef5xsezbVI 23zoskuyrQd0/x+NTqDX273SVeT9UxgREFRWDE6TwrxuFGIw2fMncnUGgAlPksIFNo4a ec470bLD5pEHafmBjFXWcBKt6cKLVaJFmiPXBQK2Tg6icEano5vDj0cIWZ7B0uHxbeTh kSRA== X-Gm-Message-State: AElRT7GtVYdO1UMFIuQiUCozeHe27rebGodCv02Ka0rrZydEvaSTcmBD UTL80dTVJSuDglWy4Aaf1udklA== X-Google-Smtp-Source: AG47ELtOP5Dl3Dey2knB7OM8uTWkG8vD2bFKqOk6/z8X4GU80B/jdsIMfrZmONYGb5Qs92UqgIyOAg== X-Received: by 10.167.131.86 with SMTP id z22mr2016792pfm.185.1520978399872; Tue, 13 Mar 2018 14:59:59 -0700 (PDT) Received: from new-host-2.home.com ([192.55.54.44]) by smtp.gmail.com with ESMTPSA id j23sm1723474pfi.78.2018.03.13.14.59.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Mar 2018 14:59:59 -0700 (PDT) From: Denis Kenzior To: linux-wireless@vger.kernel.org Cc: Denis Kenzior Subject: [RFC v5 5/9] nl80211: Add SOCKET_OWNER support to JOIN_IBSS Date: Tue, 13 Mar 2018 16:59:38 -0500 Message-Id: <20180313215942.29176-6-denkenz@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20180313215942.29176-1-denkenz@gmail.com> References: <20180313215942.29176-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 24b1bd940fca..e678dc510f3a 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -8691,6 +8691,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; }