From patchwork Thu Jul 7 07:08:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 9217359 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 26C0560B16 for ; Wed, 6 Jul 2016 23:08:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16A3628525 for ; Wed, 6 Jul 2016 23:08:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C0AB28523; Wed, 6 Jul 2016 23:08:57 +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 A71E028524 for ; Wed, 6 Jul 2016 23:08:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932909AbcGFXIq (ORCPT ); Wed, 6 Jul 2016 19:08:46 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:36835 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932892AbcGFXIj (ORCPT ); Wed, 6 Jul 2016 19:08:39 -0400 Received: by mail-oi0-f65.google.com with SMTP id m11so175148oik.3 for ; Wed, 06 Jul 2016 16:08:38 -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=iEMReQMdGwpvtj/BxT4zPBJO17pnIqpsbhWda04d1Ss=; b=MW2aj6G3oWffYfS0blIXN4IdaMOa55YxUmPROU8WF2pSexCTkBIjMwRm1tNJPhTMPf A71CaR7U4grZ5hexyf0TZUx50j5/0IbMcHRSkyhgEYvbCoqCQQAyiEdlErrXg5QTdsdo WEknK8gfPjP+w6xGAyyouJPnP5YgPEgJtbyUdX8lju7Vqd9IQuUXfK9BQkVPSdVZUmoO Uf+yuhb5e/e8L8RrBhHjVVXs3pfDTgGLsoK+8fTy98cwjazQkjB7zyfKT0RTaho3zzy2 tDrANIPJYwJOv+IShZ7YYXlu6Z8kaU/j6X8xnOsDVgZUdg0IRzpc80u3IVAd45Go/vII IkOw== 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=iEMReQMdGwpvtj/BxT4zPBJO17pnIqpsbhWda04d1Ss=; b=cJ4gvU3mQAMdhHrJ6YMPy8PnerdoF54m3rrPHd82qut+w7TT+vZd/m+pYN+6PQ/56T ZPnJHTOHurP7r1SudkEwxLCK8lA6knLVls1VXgM/XTr8hTBmMIyB34FcoCeW3ybRdO67 1kQ0p7mI4WXvj3GeWHBhCRhESQOnh2gAM6kbKN4sPv63B0Jfg7LZoUReaStSnWZZ5ke3 kqVcfXEN+VY4Fm2m6Lyn264athZNjBi8IELf+TP4aMffRjlfJk2ORGpFyE2p/WcMJJLA pHHsGf0rxL7dpeoJKgnkCjeJ9sX1csV9FNyjSTcVbuKNiUF7BDsgrNRbbIGyvAuBh6Zk EiZg== X-Gm-Message-State: ALyK8tJNGLvX/aoCYL9sNhBiSSTyS7tWbll5/0d0ET42dF2U703Dy9kkhpgyvbWfC8n89g== X-Received: by 10.202.73.16 with SMTP id w16mr14353449oia.92.1467846518427; Wed, 06 Jul 2016 16:08:38 -0700 (PDT) Received: from iwd-test.home ([99.198.216.198]) by smtp.gmail.com with ESMTPSA id a74sm1051195oic.21.2016.07.06.16.08.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Jul 2016 16:08:38 -0700 (PDT) From: Denis Kenzior To: linux-wireless@vger.kernel.org Cc: Denis Kenzior Subject: [PATCH 3/5] nl80211: Emit NEW_INTERFACE only in special cases Date: Thu, 7 Jul 2016 02:08:48 -0500 Message-Id: <1467875330-7835-4-git-send-email-denkenz@gmail.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1467875330-7835-1-git-send-email-denkenz@gmail.com> References: <1467875330-7835-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 For wireless device objects with an associated netdev, the NEW_INTERFACE event is generated inside the netdev notifier. The event is generated regardless of whether it was due to a NL80211_CMD_NEW_INTERFACE call from userspace or if the netdev was created implicitly by the driver. If NL80211_CMD_NEW_INTERFACE handler is called, then a duplicate NEW_INTERFACE event will be multicast. This change modifies the logic inside nl80211_new_interface to avoid this. --- net/wireless/nl80211.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) 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); }