From patchwork Thu Jul 7 07:08:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 9217361 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 3E79F607D9 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 2FBB328523 for ; Wed, 6 Jul 2016 23:08:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2494C28529; 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 C800828527 for ; Wed, 6 Jul 2016 23:08:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932925AbcGFXIu (ORCPT ); Wed, 6 Jul 2016 19:08:50 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:36838 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932724AbcGFXIp (ORCPT ); Wed, 6 Jul 2016 19:08:45 -0400 Received: by mail-oi0-f66.google.com with SMTP id m11so175179oik.3 for ; Wed, 06 Jul 2016 16:08:40 -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=+jE2Pvxc2YXNc5xHQAYPrKi1JtCLEn/PsHIjmJXE+fg=; b=Mfd7zW8Lmiv+9LVrOhx9y7b4aXEm3rfD0Gy4q1gdbCk1RsInginijsoeqi6nXdRFn4 JGvaRPJIB9ArjQrGUHI/1Wu5U/vCtPE5XXwmffhBJMxMyxfnqK1QpdWuz98xIP28FCYc j9aViNEkR8CCvvA5yFmpQNNRXjz4pStCfGwXgytIwJf30oviUONdNO343FO5qG1S5+0p 30xibtcx2eJ2y80VNDl4VRckioRRbOST0z+cthGEPjyMayAimhKR3067rMCQs9WBoBRo jkv/dUUy/9d/0Q8zwWgTGuLGgnLN9+ziX6CqsC50HXpJhTP4j/7o4OGXmhokcRi/l0nx jYNA== 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=+jE2Pvxc2YXNc5xHQAYPrKi1JtCLEn/PsHIjmJXE+fg=; b=G/fOej4y7erG27koMyJ/3kSjvdt3eAwAny5exjDI/L/RM4qnlXKnA4IgQIDeA+z/T3 sZGSw/4WbRZ7jy5ZbLFoCbopJRIr57PmXnjLBlRBNOsArqXDy8TfypIhrse/sINnYR29 qHTn/65ppbaBZ40BQmHKbT6JWASkvqTZJw7/O9RovZFK2X3cP1ylqSHAKFv/jW+81gSs eKLe31VvoB9HXyPFjSCycGAf3dhW4/NyHmckemwi03PXK/DysEjjJa9T+ueD4g93qyip xmmLaWaWPdRIOEwdhD9wctIUpQqMjWS3iCF3ltmqB78SgmIRCl9hiCDH/6aJc8ccDIlA bIYQ== X-Gm-Message-State: ALyK8tIR4UHuCcXlpck6lAgPQAeee7OFdhTVWsov6ogewxOG57nABa5zNrSgR5+GWbD1sg== X-Received: by 10.157.12.248 with SMTP id o53mr9216132otd.0.1467846519680; Wed, 06 Jul 2016 16:08:39 -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.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Jul 2016 16:08:39 -0700 (PDT) From: Denis Kenzior To: linux-wireless@vger.kernel.org Cc: Denis Kenzior Subject: [PATCH 5/5] nl80211: Emit DEL_INTERFACE only in special cases Date: Thu, 7 Jul 2016 02:08:50 -0500 Message-Id: <1467875330-7835-6-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 DEL_INTERFACE event is generated inside the netdev notifier. The event is generated regardless of whether it was due to a NL80211_CMD_DEL_INTERFACE call from userspace or if the netdev was destroyed by other means. If NL80211_CMD_DEL_INTERFACE handler is called, then a duplicate DEL_INTERFACE event will be multicast. This change modifies the logic inside nl80211_del_interface to avoid this. --- net/wireless/nl80211.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index ec8eb88..a65c271 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -2913,7 +2913,17 @@ static int nl80211_del_interface(struct sk_buff *skb, struct genl_info *info) if (!rdev->ops->del_virtual_intf) return -EOPNOTSUPP; - msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); + /* + * For wdevs which have no associated netdev object (e.g. of type + * NL80211_IFTYPE_P2P_DEVICE), emit the DEL_INTERFACE event here. + * For all other types, the event will be generated from the + * netdev notifier + */ + if (!wdev->netdev) + msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); + else + msg = NULL; + if (msg && nl80211_send_iface(msg, 0, 0, 0, rdev, wdev, true) < 0) { nlmsg_free(msg); msg = NULL;