From patchwork Wed Aug 3 21:58:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 9261385 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 2B22F60754 for ; Wed, 3 Aug 2016 14:10:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1CEAA28491 for ; Wed, 3 Aug 2016 14:10:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1192F28565; Wed, 3 Aug 2016 14:10:55 +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=-4.8 required=2.0 tests=BAYES_00, DATE_IN_FUTURE_06_12, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 AC5A828491 for ; Wed, 3 Aug 2016 14:10:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756955AbcHCOKx (ORCPT ); Wed, 3 Aug 2016 10:10:53 -0400 Received: from mail-oi0-f68.google.com ([209.85.218.68]:33462 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754375AbcHCOKv (ORCPT ); Wed, 3 Aug 2016 10:10:51 -0400 Received: by mail-oi0-f68.google.com with SMTP id l9so19966407oih.0 for ; Wed, 03 Aug 2016 07:10:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=naoo5jhWA8KN2iIAcsKqwCSFZRgTi8kQgq2jlbNOQbw=; b=ZnTv7V1pL2YsdmmZdXY3dGI7Jzm8u9qpcUwJkk95ObRcFZAFwx0CkIs2udDZcweRkG EIlf9pwQklnGksi9FtRZuXuqPh3WpxDVZ4IsfM5yMBMo8DHhFgMpbIPjFQaeb0sum7km Lod6uwx+aF6kUEuCjbteSye600MlsJQRVsu3gDiDi2JSRekLC7ZLWExwudWkHjvF9COt S5x8kmmo13X1B4upTPuCzZ6bh3SVzcGrsKIoT65F8Ymp40J814ZsUyAZD9Yz250w+ipX E431YuwbpARp5BWHeqey50UAr/Zo3sLXAqDdxov1sseiIo4erfMtVToTXw1nNpSWta1U CkgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=naoo5jhWA8KN2iIAcsKqwCSFZRgTi8kQgq2jlbNOQbw=; b=Bl8Cg/r2vZI5Z/cdRK72WM8nqTDPVw4hIGgVxtrrEiuyM2QCm5fJfxZN9HZ7Ol86lW JFoU0u/KhyXbnNWJeyVU5zz4x2mAMS9rCVk1RMExjtL1pRROta/A5VuK6+STHsorKMhD RzP7gA89iWLorOTxil8tXuamdl9wIGFRRgRQTjhedMqyjNyb3rCBFGCr3eHBzsSp4/sG UObXRDdToPMlLd5XG1T+rQbpLbF38dF4Dm8KHdwGFNU5Nq8OlYZSpEE1KQfUFDkoPF0/ U5/4WHpY9QaYWRXpyGZ6t+G7FrlSFAIYwKrMcST1inbNszNZBre+NqJVXo4YSQKtIzBz WpMg== X-Gm-Message-State: AEkoouuoqx8DydjCfKhPsRw5KRZ4iS1THVg1+awDXUcKTUJF30n5p1xwUnhhschRs6oE0w== X-Received: by 10.157.31.53 with SMTP id x50mr38921492otd.78.1470232686516; Wed, 03 Aug 2016 06:58:06 -0700 (PDT) Received: from localhost.localdomain (cpe-70-114-247-242.austin.res.rr.com. [70.114.247.242]) by smtp.gmail.com with ESMTPSA id e195sm499971oic.21.2016.08.03.06.58.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Aug 2016 06:58:06 -0700 (PDT) From: Denis Kenzior To: linux-wireless@vger.kernel.org Cc: Denis Kenzior Subject: [PATCH v3 2/3] core: Always notify of new wireless netdevs Date: Wed, 3 Aug 2016 16:58:34 -0500 Message-Id: <1470261515-2830-3-git-send-email-denkenz@gmail.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1470261515-2830-1-git-send-email-denkenz@gmail.com> References: <1470261515-2830-1-git-send-email-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 This change alters the semantics of NL80211_CMD_NEW_INTERFACE events by always sending this event whenever a new net_device object associated with a wdev is registered. Prior to this change, this event was only sent as a result of NL80211_CMD_NEW_INTERFACE command sent from userspace. This allows userspace to reliably detect new wireless interfaces (e.g. due to hardware hot-plug events, etc). For wdevs created without an associated net_device object (e.g. NL80211_IFTYPE_P2P_DEVICE), the NL80211_CMD_NEW_INTERFACE event is still generated inside the relevant nl80211 command handler. Signed-off-by: Denis Kenzior --- net/wireless/core.c | 2 ++ net/wireless/nl80211.c | 23 +++++++++-------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/net/wireless/core.c b/net/wireless/core.c index 7645e97..7758c0f 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -1079,6 +1079,8 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb, wdev->iftype == NL80211_IFTYPE_P2P_CLIENT || wdev->iftype == NL80211_IFTYPE_ADHOC) && !wdev->use_4addr) dev->priv_flags |= IFF_DONT_BRIDGE; + + nl80211_notify_iface(rdev, wdev, NL80211_CMD_NEW_INTERFACE); break; case NETDEV_GOING_DOWN: cfg80211_leave(rdev, wdev); diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index c174770..591c3ab 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -2787,7 +2787,7 @@ static int nl80211_new_interface(struct sk_buff *skb, struct genl_info *info) struct cfg80211_registered_device *rdev = info->user_ptr[0]; struct vif_params params; struct wireless_dev *wdev; - struct sk_buff *msg, *event; + struct sk_buff *msg; int err; enum nl80211_iftype type = NL80211_IFTYPE_UNSPECIFIED; u32 flags; @@ -2891,20 +2891,15 @@ static int nl80211_new_interface(struct sk_buff *skb, struct genl_info *info) return -ENOBUFS; } - event = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); - if (event) { - if (nl80211_send_iface(event, 0, 0, 0, - rdev, wdev, false) < 0) { - nlmsg_free(event); - goto out; - } - - genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), - event, 0, NL80211_MCGRP_CONFIG, - GFP_KERNEL); - } + /* + * For wdevs which have no associated netdev object (e.g. of type + * NL80211_IFTYPE_P2P_DEVICE), emit the NEW_INTERFACE event here. + * For all other types, the event will be generated from the + * netdev notifier + */ + if (!wdev->netdev) + nl80211_notify_iface(rdev, wdev, NL80211_CMD_NEW_INTERFACE); -out: return genlmsg_reply(msg, info); }