From patchwork Sat Jun 18 23:55:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 9185903 X-Patchwork-Delegate: kvalo@adurom.com 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 EB1D7601C0 for ; Sat, 18 Jun 2016 23:57:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C408725D97 for ; Sat, 18 Jun 2016 23:57:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A5EBB27D4A; Sat, 18 Jun 2016 23:57:30 +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.8 required=2.0 tests=BAYES_00, 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 4341C25D97 for ; Sat, 18 Jun 2016 23:57:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751224AbcFRX5J (ORCPT ); Sat, 18 Jun 2016 19:57:09 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:33452 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751154AbcFRX5H (ORCPT ); Sat, 18 Jun 2016 19:57:07 -0400 Received: by mail-lf0-f65.google.com with SMTP id l188so2548778lfe.0; Sat, 18 Jun 2016 16:57:05 -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:mime-version :content-transfer-encoding; bh=966rtsEXIAAf+82BrbZmOpMLRFxjjxq27/nskukYhY0=; b=A7IBu8xCLBo80EJYasJPgGiD5gB8AT4tYNOhBsOdrQ4aXmlTkgn0+dT3Mh8KNFyC5X DnuytAeSZ6e3yIEi0+Fu3kIfOMsuumLXjUOXqDQPK1wwmjvA6KBXsMbyExN4ZOpjWcU9 ZtSrFjnr94BNwpMkzggCTbYXaZunNNgENcRkhFJkPvw9/b9e1SdwbhwQEmGzgebbpLa1 E5Pe/LgXkCVYU22wkWSxhR/1EarTUL0r5wlivf5+3K7d+Laq+QZbeXBSbroTARIOBdgR Tu8FncEMb1UAXp07O5UaUprScI2d0ZelOTX3hRC4XmBbb/SADBlEm52h7N13INUUKgUL aJ5w== 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:mime-version :content-transfer-encoding; bh=966rtsEXIAAf+82BrbZmOpMLRFxjjxq27/nskukYhY0=; b=kPaKm0raR6h8z2QXhPN9+1uvDMkEqjodgRrpHf0huNb9Tnmk3m82Na92xFff8KlqQB FA45wsAfhSzrWKh4F7vaFOJoBmmNJFr0Dck12BVoeZ0wfqPPhulqq6+/oE1FyAGVbcxw eNROQ8fZUjXf55mOjidnxhAW4Kq+4YRcXHpKoMIoeiir9QxAnNV9Rxm37KlxgEGxOciG WdAeKkAWmcG3jQxWwq6BKdahYcRscPKtJn/CTrFm1kt8ZinFVvuWhFQkkSYlPv0KBDVy d0C3kEa+BoQKVbF0UBWsFH7U75CXW7RZv6+UBNID24BhK/SXekz7hMKBOodotP6qCyhx M1Aw== X-Gm-Message-State: ALyK8tJGdj8IKl21yT/iGsUU89sLb0tkdhAYbtcryiMcOcswVw4tpLwFa1RaCE3MvdudoQ== X-Received: by 10.25.17.209 with SMTP id 78mr2527313lfr.154.1466294224088; Sat, 18 Jun 2016 16:57:04 -0700 (PDT) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id u19sm2839165lja.12.2016.06.18.16.57.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Jun 2016 16:57:03 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Kalle Valo Cc: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Arend van Spriel , Franky Lin , Hante Meuleman , Pieter-Paul Giesberts , "Franky (Zhenhui) Lin" , linux-wireless@vger.kernel.org (open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER), brcm80211-dev-list.pdl@broadcom.com (open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER), netdev@vger.kernel.org (open list:NETWORKING DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] brcmfmac: add missing break when deleting P2P_DEVICE Date: Sun, 19 Jun 2016 01:55:57 +0200 Message-Id: <1466294168-8890-1-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.8.4.5 MIME-Version: 1.0 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 We obviously don't want to fall through in that switch. With this change 1) We wait for event (triggered by p2p_disc) as expected 2) We remove interface manually on timeout 3) We return 0 on success instead of -ENOTSUPP Signed-off-by: Rafał Miłecki --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c index 426ff05..f6241fd 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c @@ -2261,6 +2261,8 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev) return 0; brcmf_p2p_cancel_remain_on_channel(vif->ifp); brcmf_p2p_deinit_discovery(p2p); + break; + default: return -ENOTSUPP; }