From patchwork Tue Mar 13 21:59:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 10280995 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 E83456038F for ; Tue, 13 Mar 2018 22:00:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D6AE82821F for ; Tue, 13 Mar 2018 22:00:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB23928538; Tue, 13 Mar 2018 22:00:01 +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 742F12821F for ; Tue, 13 Mar 2018 22:00:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752729AbeCMWAA (ORCPT ); Tue, 13 Mar 2018 18:00:00 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:38668 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752592AbeCMV77 (ORCPT ); Tue, 13 Mar 2018 17:59:59 -0400 Received: by mail-pf0-f195.google.com with SMTP id d26so491097pfn.5 for ; Tue, 13 Mar 2018 14:59:58 -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=e74HFV5yF3yEgCTn9vxMBXzyEBKYNY2JFGNZu67+m2fF8zRoaOtFNxPgZHRqPG7VJv XjYLlkc94Tzp+AItSVroIp2znEZw2k72kXAd2qurKGNCMCxIjZ8/dB52bOlJnl841ZEL UygFlOE+wh48H9m4KfpzjTCpwiYZcSpxjOfvwdtdmaNGHLajdCIUwk4hOYMRuEPP5QLE O17YF4ydkNBeC7EQKmFWPZTulqD8kUAMFyw362Wq6ArmRf9ju1P5URDve/AsBshhRnTg ZRDJ+cHWpHRqmgqb+zK3yhYHCPc1ysAZDD9lArrrFvxPwon0m8hQU891eeA96AKYt2W5 8CSA== 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=P9erP8tXvdz1ByYda5MKUpyYC5IJ9HPJrQKPlxRXJ7P2oIDpNhRTrQ6ndh7AcO5aqS rNHGVyZ7Tg5XC53wbNgtQFHQwbVQHwx2d8CnU0kw6iW38PtpqcQ5OAKwCYzciwpRgOTG FmKNItTWUNc2Y/HVNDGfRJUcNrvM1yEhmHuc13EowK0OyflQHrnw3XBrAiy1b0wHoWW0 jcnRiOAQh0Oj3sD4xSGWN6YQoJ+44C+mQZ1HQRW5JWP0V3xAZJoM5VqojR31xKOa+Vbe GIdybRuNg79PMjf6e4OPXznAA2iqPRU4A7PYFQ/h9pYZ3GnkikHU4/ruWwxqTHbO+1Or YOPA== X-Gm-Message-State: AElRT7EN21Pzzlpm07Z0mh0dIJ6yfAnJlq4Nby6o5LQFG/6ieGX+rdN0 gDfB3EM9KGshKNuRO8/Kx3qxnQ== X-Google-Smtp-Source: AG47ELtJbEN7V5U4KMK2bFivgipHjXN6t+wpizdL7sDQUqEZ2h4himknMrU/bqw2xb2hHrHctMolUQ== X-Received: by 10.99.179.14 with SMTP id i14mr1706726pgf.45.1520978398406; Tue, 13 Mar 2018 14:59:58 -0700 (PDT) Received: from new-host-2.home.com ([192.55.54.44]) by smtp.gmail.com with ESMTPSA id j23sm1723474pfi.78.2018.03.13.14.59.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Mar 2018 14:59:57 -0700 (PDT) From: Denis Kenzior To: linux-wireless@vger.kernel.org Cc: Denis Kenzior Subject: [RFC v5 4/9] cfg80211: Support all iftypes in autodisconnect_wk Date: Tue, 13 Mar 2018 16:59:37 -0500 Message-Id: <20180313215942.29176-5-denkenz@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20180313215942.29176-1-denkenz@gmail.com> References: <20180313215942.29176-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);