From patchwork Thu Oct 20 12:40:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arend Van Spriel X-Patchwork-Id: 9386761 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 2B381607D0 for ; Thu, 20 Oct 2016 12:40:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A8652961F for ; Thu, 20 Oct 2016 12:40:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0CE30296C1; Thu, 20 Oct 2016 12:40:36 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 11D7229665 for ; Thu, 20 Oct 2016 12:40:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933975AbcJTMkb (ORCPT ); Thu, 20 Oct 2016 08:40:31 -0400 Received: from mail-lf0-f46.google.com ([209.85.215.46]:35813 "EHLO mail-lf0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933043AbcJTMk3 (ORCPT ); Thu, 20 Oct 2016 08:40:29 -0400 Received: by mail-lf0-f46.google.com with SMTP id l131so77586286lfl.2 for ; Thu, 20 Oct 2016 05:40:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=ChJH7O1OlofBgsq6bLyB1lLAA7lpeBHV7UbW045usK0=; b=d+YDKpIb6/AI86WCWm+jNEIeHWktOZNM66VHy/cO9WOT6ZdaSIRcgs63LD9FiKLKa5 yu5ecpByDe87EByiMWntQoLzk/AaemmihqQ9CnflxOo58lFH9WUK0PctrH6dOeHs4p/l LBglGIpwveieno0dC5TuPurUCj9FNVzcPPP+g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=ChJH7O1OlofBgsq6bLyB1lLAA7lpeBHV7UbW045usK0=; b=lj2Pl6JKTkXRUmBsXidFXaL+55O2DhF28F3H4Kp7dAUvkpXLCCjZtFfzDSJPZ3NiVW ph5lz1Dj1FVVyc4Gimgy3xGcq8wYT+W2evKJXc3oAOqBW33IjWA0Q2Ssx9+d4GZI685v 59TOgayiq3ox9wRdE8fbGWa6TobQuQAkGaxnDX9ZTZyC7Ygv6ejEM0F/LFe1ViAo9ZIR XO1NIh8B142s8w82wSean64w/+QzTLgaNUjf6Qywp74kjbjyElY4dqe8LrOoZZwNLi6c 2RiJnR1KBzXruqTZU6EPGxpaFpIQxmfjDsdtXmWIKBslCkmiVh76US8yIKxyWO+bBi9N hKaA== X-Gm-Message-State: AA6/9RnMrbVjkAeQsaft5p9SzmvRdfOo7DdofhaBDf0wLjzo+UFxUnwjdB00+cqEaQHYix/h X-Received: by 10.25.21.12 with SMTP id l12mr1295075lfi.152.1476967227668; Thu, 20 Oct 2016 05:40:27 -0700 (PDT) Received: from [10.11.211.143] ([192.19.213.250]) by smtp.gmail.com with ESMTPSA id h73sm12171989lji.28.2016.10.20.05.40.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Oct 2016 05:40:27 -0700 (PDT) Subject: Re: [PATCH] cfg80211: allow vendor commands to be sent to nan interface To: Luca Coelho , johannes@sipsolutions.net References: <20161019044747.15921-1-luca@coelho.fi> Cc: linux-wireless@vger.kernel.org, Andrei Otcheretianski , Luca Coelho From: Arend Van Spriel Message-ID: Date: Thu, 20 Oct 2016 14:40:20 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <20161019044747.15921-1-luca@coelho.fi> 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 On 19-10-2016 6:47, Luca Coelho wrote: > From: Andrei Otcheretianski > > Allow vendor commands that require WIPHY_VENDOR_CMD_NEED_RUNNING flag, to > be sent to NAN interface. > > Signed-off-by: Andrei Otcheretianski > Signed-off-by: Luca Coelho > --- > net/wireless/nl80211.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c > index e48b9c3..fcf5b4f 100644 > --- a/net/wireless/nl80211.c > +++ b/net/wireless/nl80211.c > @@ -11258,7 +11258,8 @@ static int nl80211_vendor_cmd(struct sk_buff *skb, struct genl_info *info) > if (wdev->netdev && > !netif_running(wdev->netdev)) > return -ENETDOWN; > - if (!wdev->netdev && !wdev->p2p_started) > + if (!wdev->netdev && !wdev->p2p_started && > + !wdev->nan_started) > return -ENETDOWN; Seeing this patch flying by, my itch became unbearable so I cooked up the patch below. Please consider this an RFC and let me know your thoughts. Regards, Arend --- if (rfkill_blocked(rdev->rfkill)) @@ -10538,7 +10538,7 @@ static int nl80211_start_p2p_device(struct sk_buff *skb, struct genl_info *info) if (err) return err; - wdev->p2p_started = true; + wdev->is_running = true; rdev->opencount++; return 0; @@ -10570,7 +10570,7 @@ static int nl80211_start_nan(struct sk_buff *skb, struct genl_info *info) if (wdev->iftype != NL80211_IFTYPE_NAN) return -EOPNOTSUPP; - if (wdev->nan_started) + if (!wdev_is_running(wdev)) return -EEXIST; if (rfkill_blocked(rdev->rfkill)) @@ -10593,7 +10593,7 @@ static int nl80211_start_nan(struct sk_buff *skb, struct genl_info *info) if (err) return err; - wdev->nan_started = true; + wdev->is_running = true; rdev->opencount++; return 0; @@ -10678,7 +10678,7 @@ static int nl80211_nan_add_func(struct sk_buff *skb, if (wdev->iftype != NL80211_IFTYPE_NAN) return -EOPNOTSUPP; - if (!wdev->nan_started) + if (!wdev_is_running(wdev)) return -ENOTCONN; if (!info->attrs[NL80211_ATTR_NAN_FUNC]) @@ -10915,7 +10915,7 @@ static int nl80211_nan_del_func(struct sk_buff *skb, if (wdev->iftype != NL80211_IFTYPE_NAN) return -EOPNOTSUPP; - if (!wdev->nan_started) + if (!wdev_is_running(wdev)) return -ENOTCONN; if (!info->attrs[NL80211_ATTR_COOKIE]) @@ -10943,7 +10943,7 @@ static int nl80211_nan_change_config(struct sk_buff *skb, if (wdev->iftype != NL80211_IFTYPE_NAN) return -EOPNOTSUPP; - if (!wdev->nan_started) + if (!wdev_is_running(wdev)) return -ENOTCONN; if (info->attrs[NL80211_ATTR_NAN_MASTER_PREF]) { @@ -11255,11 +11255,7 @@ static int nl80211_vendor_cmd(struct sk_buff *skb, struct genl_info *info) return -EINVAL; if (vcmd->flags & WIPHY_VENDOR_CMD_NEED_RUNNING) { - if (wdev->netdev && - !netif_running(wdev->netdev)) - return -ENETDOWN; - if (!wdev->netdev && !wdev->p2p_started && - !wdev->nan_started) + if (!wdev_is_running(wdev)) return -ENETDOWN; } @@ -11422,10 +11418,7 @@ static int nl80211_vendor_cmd_dump(struct sk_buff *skb, return -EINVAL; if (vcmd->flags & WIPHY_VENDOR_CMD_NEED_RUNNING) { - if (wdev->netdev && - !netif_running(wdev->netdev)) - return -ENETDOWN; - if (!wdev->netdev && !wdev->p2p_started) + if (!wdev_is_running(wdev)) return -ENETDOWN; } } @@ -11796,29 +11789,14 @@ static int nl80211_pre_doit(const struct genl_ops *ops, struct sk_buff *skb, info->user_ptr[1] = wdev; } - if (dev) { - if (ops->internal_flags & NL80211_FLAG_CHECK_NETDEV_UP && - !netif_running(dev)) { - if (rtnl) - rtnl_unlock(); - return -ENETDOWN; - } - - dev_hold(dev); - } else if (ops->internal_flags & NL80211_FLAG_CHECK_NETDEV_UP) { - if (wdev->iftype == NL80211_IFTYPE_P2P_DEVICE && - !wdev->p2p_started) { - if (rtnl) - rtnl_unlock(); - return -ENETDOWN; - } - if (wdev->iftype == NL80211_IFTYPE_NAN && - !wdev->nan_started) { - if (rtnl) - rtnl_unlock(); - return -ENETDOWN; - } + if (ops->internal_flags & NL80211_FLAG_CHECK_NETDEV_UP && + !wdev_is_running(wdev)) { + if (rtnl) + rtnl_unlock(); + return -ENETDOWN; } + if (dev) + dev_hold(dev); info->user_ptr[0] = rdev; } diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 2bbbcc3..0010e5a 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -3781,8 +3781,8 @@ static inline struct wiphy *wiphy_new(const struct cfg80211_ops *ops, * @beacon_interval: beacon interval used on this device for transmitting * beacons, 0 when not valid * @address: The address for this device, valid only if @netdev is %NULL - * @p2p_started: true if this is a P2P Device that has been started - * @nan_started: true if this is a NAN interface that has been started + * @is_running: true if this is a non-netdev device that has been started, eg. + * like the P2P Device. * @cac_started: true if DFS channel availability check has been started * @cac_start_time: timestamp (jiffies) when the dfs state was entered. * @cac_time_ms: CAC time in ms @@ -3814,7 +3814,7 @@ struct wireless_dev { struct mutex mtx; - bool use_4addr, p2p_started, nan_started; + bool use_4addr, is_running; u8 address[ETH_ALEN] __aligned(sizeof(u16)); @@ -3871,6 +3871,13 @@ static inline u8 *wdev_address(struct wireless_dev *wdev) return wdev->address; } +static inline bool wdev_is_running(struct wireless_dev *wdev) +{ + if (wdev->netdev) + return netif_running(wdev->netdev); + return wdev->is_running; +} + /** * wdev_priv - return wiphy priv from wireless_dev * diff --git a/net/wireless/core.c b/net/wireless/core.c index f433f15..088ba44 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -210,11 +210,11 @@ void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev, if (WARN_ON(wdev->iftype != NL80211_IFTYPE_P2P_DEVICE)) return; - if (!wdev->p2p_started) + if (!wdev_is_running(wdev)) return; rdev_stop_p2p_device(rdev, wdev); - wdev->p2p_started = false; + wdev->is_running = false; rdev->opencount--; @@ -233,11 +233,11 @@ void cfg80211_stop_nan(struct cfg80211_registered_device *rdev, if (WARN_ON(wdev->iftype != NL80211_IFTYPE_NAN)) return; - if (!wdev->nan_started) + if (!wdev_is_running(wdev)) return; rdev_stop_nan(rdev, wdev); - wdev->nan_started = false; + wdev->is_running = false; rdev->opencount--; } diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index fcf5b4f..e37801e 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -10528,7 +10528,7 @@ static int nl80211_start_p2p_device(struct sk_buff *skb, struct genl_info *info) if (wdev->iftype != NL80211_IFTYPE_P2P_DEVICE) return -EOPNOTSUPP; - if (wdev->p2p_started) + if (wdev_is_running(wdev)) return 0;