From patchwork Mon Mar 26 17:52:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 10308457 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 AC7BB60325 for ; Mon, 26 Mar 2018 17:53:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A047F295C3 for ; Mon, 26 Mar 2018 17:53:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9522B297BD; Mon, 26 Mar 2018 17:53:22 +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 45D1E295C3 for ; Mon, 26 Mar 2018 17:53:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752766AbeCZRxV (ORCPT ); Mon, 26 Mar 2018 13:53:21 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:41462 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752519AbeCZRxE (ORCPT ); Mon, 26 Mar 2018 13:53:04 -0400 Received: by mail-oi0-f65.google.com with SMTP id 188-v6so354450oih.8 for ; Mon, 26 Mar 2018 10:53:03 -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=hryxuzZsRLNPcIGR0nM+RsOLqFVq9d8O/hKa4Hg0L9PWUSs0vwV+1PlNQodewQvRWb OGlnK2eIjQsP53XoOQYUIdYR7osR1qaLIVkTg2CoJC4BP87Mr8Ga2umdmXCL8xsa9URw zIUAU9HEUogYQJ+g7PNJVr92xYHJjLWhFs5H6sFvaNtkniuqAf66gMgyIExY+CmSXLE2 TewUHSQrwa3Ndf7zIsC0hhBHcsubW3lGsNdV/dtbjTspgjNTApOy0N9Ay7LDWlIB5MJg 89DJmJRTkUJeYqwZtqZevHAeDdd8T6UUrCadT67BNV2QWNdywa4X98dnYyFmixiZalXL jQyA== 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=Xnivm3upTtATp1O7DPFKxzH8+I9WHH5yw+c+pyy9k7jAv+sSBXoIfldksSlxCij8WL 0JwUl2M9P+fmKMHhqzSelrZt8JCep/8J6cJ+G4Xse16ra6IimYwNSqMUI05yxgmy+pi1 JNRbD4j3iAW3RKxx7pLU7KL70uwFjws5qrTqG/HAn5IroMeuLHjQahM5+o7SJ4Pl9nqd awloanGO9v2wqJqU8CoqazYc296xxBdcS/cMJwZAbJOOWU7OcvjYNrr3Q9oQrmZosv58 RrGqELaGmGbSynilV7Nawnj5ONvSUECS6xhf0n5xjItPaciBG1+S7vfEya3sx5ldM2Ky OyTQ== X-Gm-Message-State: AElRT7GOmmBesHqSoJ+A8sq4uOCZKt+EiiqshsVTm/Db+cxC+cdy6OWu 6xjs4d7C6MowArE2LaXoP8gkIw== X-Google-Smtp-Source: AIpwx49R4GCeOvi9EwdZg9hhpR0UGEEMJRgyWtMI16QMM0U7eTK8OBe8W+sOm6EXSrz6qhGGUJJWzw== X-Received: by 10.202.15.4 with SMTP id 4mr3738052oip.62.1522086783329; Mon, 26 Mar 2018 10:53:03 -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.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Mar 2018 10:53:02 -0700 (PDT) From: Denis Kenzior To: linux-wireless@vger.kernel.org Cc: Denis Kenzior Subject: [PATCH v7 05/11] nl80211: Add SOCKET_OWNER support to JOIN_IBSS Date: Mon, 26 Mar 2018 12:52:45 -0500 Message-Id: <20180326175251.20666-6-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/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; }