From patchwork Sat Jul 9 06:16:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 9221847 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 09BD26089D for ; Fri, 8 Jul 2016 22:31:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE25627C14 for ; Fri, 8 Jul 2016 22:31:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E18E2285CB; Fri, 8 Jul 2016 22:31:17 +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 8A14A27C14 for ; Fri, 8 Jul 2016 22:31:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756415AbcGHWbQ (ORCPT ); Fri, 8 Jul 2016 18:31:16 -0400 Received: from mail-oi0-f68.google.com ([209.85.218.68]:33452 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756327AbcGHWbP (ORCPT ); Fri, 8 Jul 2016 18:31:15 -0400 Received: by mail-oi0-f68.google.com with SMTP id w141so12089812oia.0 for ; Fri, 08 Jul 2016 15:31:14 -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=4QpbJh17SqC3Nvs1tnRnIZDwR00m+G4WTr0uPTDUf/A=; b=vRkVAmLh4OTlezns0fpsQ3b8k9Z/Kwn8dD5MAR48ve89JXg2jYY+5H6U6waZvc7h6V Wgtkh5Aypcl9DW4ZLAXBzgOoOX3/+7GCh3rUPQKUuL8BSYjmxUkIsGfrSKB8xGu4lkEU BbtoZbodY6dQXklvGCRZhWxBvNg9Ub62iYs9TfOPA1eFgsoMeM3ahpt+m1uLqtroozn3 0Ia0mUCOwYrOxUspJaX3NPNssb8BW4ZbTcatlP+Ujiu+wd1w3umiT06WVP8yWpGxwfkU U/rrrUrbfUbVAnq9QTHKb3VeYP9zZQsdywpOEyk9npNsBJJWwgQMp4QK0fnN9Ws0912s rdhg== 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=4QpbJh17SqC3Nvs1tnRnIZDwR00m+G4WTr0uPTDUf/A=; b=fWy+fZwS0lBRxGRlpfsozul/DqmVMKH9JkfrlZJmmk/0jloNslgmTeAbqdZGM0hZqQ JV1lhFGiUsUl6oia+OeRg0j81lQubbOaVczNs+qq+srn/ZfsiG9S6E5+NtLDknoXaH9t ZESMDvKv5gxGBBLi7m2q/Fb/nwdScz+OGVmoAzRPK7RBLxc9rL+7gKywmbYlvj3oeTv9 hYfNg0DT7JB71VpqIX12m+LUwxqoUKmvU4+HUZfPy3uQBsvFpMTnOAuO2gv5wmBT0Xye yhP1+eqm84+E2fAdbI4pDwbwBeD3hE54WMGTezTIKYSCbYBPAE1mqV+t/G4pSZP7dMXz PuGA== X-Gm-Message-State: ALyK8tI4KFloFbL6z5FO2K6dlLdPnlpyXS2WOHRjddCFQ+6TQvt5cf7iSylKdy024k6eQg== X-Received: by 10.157.41.134 with SMTP id n6mr4409705otb.69.1468016157446; Fri, 08 Jul 2016 15:15:57 -0700 (PDT) Received: from iwd-test.home ([99.198.216.198]) by smtp.gmail.com with ESMTPSA id 9sm227560oth.15.2016.07.08.15.15.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Jul 2016 15:15:56 -0700 (PDT) From: Denis Kenzior To: linux-wireless@vger.kernel.org Cc: Denis Kenzior Subject: [RFC v2 2/3] core: Always notify of new wireless netdevs Date: Sat, 9 Jul 2016 01:16:06 -0500 Message-Id: <1468044967-9236-3-git-send-email-denkenz@gmail.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1468044967-9236-1-git-send-email-denkenz@gmail.com> References: <1468044967-9236-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 da03e17..ec8eb88 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); }