From patchwork Mon Mar 26 17:52:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 10308443 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 DBF0260325 for ; Mon, 26 Mar 2018 17:53:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF63F29605 for ; Mon, 26 Mar 2018 17:53:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C4702297C0; Mon, 26 Mar 2018 17:53:05 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI 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 767DB29605 for ; Mon, 26 Mar 2018 17:53:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752675AbeCZRxE (ORCPT ); Mon, 26 Mar 2018 13:53:04 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:42323 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752289AbeCZRxD (ORCPT ); Mon, 26 Mar 2018 13:53:03 -0400 Received: by mail-oi0-f66.google.com with SMTP id l190-v6so8598391oig.9 for ; Mon, 26 Mar 2018 10:53:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UAHGojkpKkKrWUoLaM58z4JAXWdnsWPf1rE3SUOx5v0=; b=Qu55dlQBz26nr7le55VrRx0YpN/mJb/EIhLei3mNFz5PXGVuW9yQ6s2J9XqefzEEdK 2UGO+yk1wNlm7GdiCQpRE57Nhp8eysKT/Q0InScCL+MGIhEFyQu9GLJLkSmLA5DSCR2p UptvBMJSCfmFab6l96GAfvB5zLseuSqVgsrPf48HIQUt+quRMkOJQ9E59KG3/MUXAdoT wHn131yFHyBjuv7pxm2D/c+cEvcl3VOpwBfrO9Zc7qxuJdVTUWqrxCuX7pdYm1XqGabL lQ/HMGj9ZEdXSVZLZUrvCJ6H9oqb1VYl+5BJsaML98ehXEG8XDsvlWoQ1CmqoBVwOWbw k0qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UAHGojkpKkKrWUoLaM58z4JAXWdnsWPf1rE3SUOx5v0=; b=mSQn5KaD9bIFqJ5YRHCZBFNDyrlSfGVorzIz+YrEp4ebU1D0TMHa68pE0YD5FdL/cc POad4CNn4v1+ETCwiixAmCEiuFVYFvJavpuH1zyqL+kDLrRMen/wlw86ruM6FchRBK6T kEwKaz7szIvXklloPzol6kFktsIRyjg13PJJuWyoFsYbkoMyLShzi3S6eVtJz/KxgdC7 Mo5KHLFtFgoXPDhKWu0d9XL+myccZfKcNXn6Sl9SWa4qXB7yF4EwNoqUdXuTC5YZ7K4c N4t3VBOdZaYcvElDIRkpUBueG7gPyJTPiLM2v7GkEXSl9RN28ueROWSbk0TzA+aeIcZu jySg== X-Gm-Message-State: AElRT7GY9527jKXr+ROO2NaN4Bx6cG06DY7phFDf7mlTxeI6d5OgoWRi hP03KIihGDp6M8zfwHPEBzz0EA== X-Google-Smtp-Source: AIpwx489eNr5CLen4vrFhfJx1Q+anFYYpbnQ36kG1PkdGZCFYmv+Ip4lucnvASAu6oZfq5FIfBCrxQ== X-Received: by 10.202.197.3 with SMTP id v3mr4387484oif.153.1522086782348; Mon, 26 Mar 2018 10:53:02 -0700 (PDT) Received: from new-host-2.home (cpe-70-114-247-242.austin.res.rr.com. [70.114.247.242]) by smtp.gmail.com with ESMTPSA id t1-v6sm9112952oth.75.2018.03.26.10.53.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Mar 2018 10:53:01 -0700 (PDT) From: Denis Kenzior To: linux-wireless@vger.kernel.org Cc: Denis Kenzior Subject: [PATCH v7 04/11] cfg80211: Support all iftypes in autodisconnect_wk Date: Mon, 26 Mar 2018 12:52:44 -0500 Message-Id: <20180326175251.20666-5-denkenz@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20180326175251.20666-1-denkenz@gmail.com> References: <20180326175251.20666-1-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 Currently autodisconnect_wk assumes that only interface types of P2P_CLIENT and STATION use conn_owner_nlportid. Change this so all interface types are supported. Signed-off-by: Denis Kenzior --- net/wireless/sme.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/net/wireless/sme.c b/net/wireless/sme.c index 701cfd7acc1b..5df6b33db786 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -1239,17 +1239,38 @@ void cfg80211_autodisconnect_wk(struct work_struct *work) wdev_lock(wdev); if (wdev->conn_owner_nlportid) { - /* - * Use disconnect_bssid if still connecting and ops->disconnect - * not implemented. Otherwise we can use cfg80211_disconnect. - */ - if (rdev->ops->disconnect || wdev->current_bss) - cfg80211_disconnect(rdev, wdev->netdev, - WLAN_REASON_DEAUTH_LEAVING, true); - else - cfg80211_mlme_deauth(rdev, wdev->netdev, - wdev->disconnect_bssid, NULL, 0, - WLAN_REASON_DEAUTH_LEAVING, false); + switch (wdev->iftype) { + case NL80211_IFTYPE_ADHOC: + cfg80211_leave_ibss(rdev, wdev->netdev, false); + break; + case NL80211_IFTYPE_AP: + case NL80211_IFTYPE_P2P_GO: + cfg80211_stop_ap(rdev, wdev->netdev, false); + break; + case NL80211_IFTYPE_MESH_POINT: + cfg80211_leave_mesh(rdev, wdev->netdev); + break; + case NL80211_IFTYPE_STATION: + case NL80211_IFTYPE_P2P_CLIENT: + /* + * Use disconnect_bssid if still connecting and + * ops->disconnect not implemented. Otherwise we can + * use cfg80211_disconnect. + */ + if (rdev->ops->disconnect || wdev->current_bss) + cfg80211_disconnect(rdev, wdev->netdev, + WLAN_REASON_DEAUTH_LEAVING, + true); + else + cfg80211_mlme_deauth(rdev, wdev->netdev, + wdev->disconnect_bssid, + NULL, 0, + WLAN_REASON_DEAUTH_LEAVING, + false); + break; + default: + break; + } } wdev_unlock(wdev);