From patchwork Wed Sep 1 03:05:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Li X-Patchwork-Id: 505001 Delivered-To: patch@linaro.org Received: by 2002:a02:8629:0:0:0:0:0 with SMTP id e38csp3358710jai; Tue, 31 Aug 2021 20:05:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwEf2P0eUYkRxwt+3qmB+VAvCjLhnTQcM42mZK4OCM/dTxsxENmQZ60zVW9vvYY/nkKxm61 X-Received: by 2002:a17:906:60c2:: with SMTP id f2mr34384889ejk.531.1630465550026; Tue, 31 Aug 2021 20:05:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630465550; cv=none; d=google.com; s=arc-20160816; b=V3WQ0LvfGriIuETRLEnbjNx0dVA9j6lB5fqeChQwUg1j7HAk6C8ejcfgDVB3zd/9Dm I763kzVAIKOk0qAgpZQP34nc5X/gNG55KekbuV8KF44CbGFE+uOzCCHpOczqerlGEtnf Pt5ONan7jzxfh5+zfzdTlLtHrEVYrvm5HrXWJM3C+o9gApigB7kg6pvSL08oyJamD2Zl z2Xuv6KsGj9HZCgx3ycDuKHHHh+ELyMAKWY//tUDV8oWDvoAu1eWnlefsvELr6yy7Zvf jFPSDJN1uRLv2qqhBvznFitTBt9M1vx+Pb6olehbkk3oqXZzrwoyKeWBpNCd2E40UG3Z WcOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=nyOJ9iZETVTEFk6iWhg2g1yikDtoNUIcwl8+erJ8BFY=; b=wEZ6ZO6wHc5lqIk4XQ/pPp3SmYPgeFTivk4VmU0FgqA6+9SIo3J4ea2XeArwlaHUD+ MWWXWfG36Cpi9bAqQM+jh/lpORUoZz/DTFCBgH0JCjAwr/Zi+DCy+Ds3A5llGGLLsKQF SKI627vmOjDx8rypA7BG3vHY/p6PAu2igy8p89rOQIFaTwYhb9H1rbXniV9hTDjo4aJ9 87/9dyotkIOacPm9Wg8sUoNXsYwo71U2dVWVUG+q+P2I24hIRkf4JWye/h6uHhtp1FLv F46R5BDM8U479EmVsmo7GjJdiIcEpTS4xeW333ib9wvh2Uw3TpvI5omzSuWS1QPP36Ht X12Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@squareup.com header.s=google header.b=d1V6u3ys; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=squareup.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id he40si20359651ejc.705.2021.08.31.20.05.49; Tue, 31 Aug 2021 20:05:50 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@squareup.com header.s=google header.b=d1V6u3ys; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=squareup.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241732AbhIADGn (ORCPT + 11 others); Tue, 31 Aug 2021 23:06:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241376AbhIADGn (ORCPT ); Tue, 31 Aug 2021 23:06:43 -0400 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49515C061764 for ; Tue, 31 Aug 2021 20:05:47 -0700 (PDT) Received: by mail-pl1-x636.google.com with SMTP id d17so627251plr.12 for ; Tue, 31 Aug 2021 20:05:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=squareup.com; s=google; h=from:to:cc:subject:date:message-id; bh=nyOJ9iZETVTEFk6iWhg2g1yikDtoNUIcwl8+erJ8BFY=; b=d1V6u3ysAEYUUAHURWSacyDQzOtUqDO+ucg+6rnhcJevnwInrzshAWGb/fRLWLMwla cuFmZBqSoqtR3njWqQ2qYCmhP3gd3jLtSBV4DjFpwkNu5EM4ZRupyrAVEWSw0KpM6qhv 645zstCpXVFvmC3fyKt0XuANOdSmyUHDvepPQ= 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; bh=nyOJ9iZETVTEFk6iWhg2g1yikDtoNUIcwl8+erJ8BFY=; b=SwrheMqj7XdwSABzTJ02wBcYv4zkoWroin4uk0UU5oP1xlzcu4AAAFuWcHDOYpdwE2 MNyf7wMxtQsMrPWGutlCmK7rGZultkKZzdnpWCY2N98v61zCTREnlOV5ANWJinf6fsXS cpStH8tDM21sOEY4JwPqmvnJkLBmKMxJPydqaG6Y3Fl9c5t6RSUAm/ranYs3TRbwmaUe BraKCd6KecAbcBFmJ0TEE+jPcyxN81RxhJqVIYUzg1YFPf82AWSzS2SKNttwT/+/FYIW G6Oruw9MszSRA+bx6z6dQlNaENCf+bC7yWO5/w0QzLyiBAo5tcqi0KnnOKGsedjbP4t/ VnoQ== X-Gm-Message-State: AOAM532P11RQ2Dy63wY6L2S8olK4jPZz8+pUt8rOXRPRlL+fYnpyQih0 UM/U00IOrIoAyNGg2WWyyW1eYNGSnnl3vUCM X-Received: by 2002:a17:90a:5d12:: with SMTP id s18mr9226138pji.35.1630465546442; Tue, 31 Aug 2021 20:05:46 -0700 (PDT) Received: from localhost (138-229-239-060.res.spectrum.com. [138.229.239.60]) by smtp.gmail.com with ESMTPSA id 77sm10856219pfz.118.2021.08.31.20.05.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Aug 2021 20:05:45 -0700 (PDT) From: Benjamin Li To: Kalle Valo Cc: Bryan O'Donoghue , Loic Poulain , Benjamin Li , stable@vger.kernel.org, "David S. Miller" , Jakub Kicinski , wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] wcn36xx: handle connection loss indication Date: Tue, 31 Aug 2021 20:05:41 -0700 Message-Id: <20210901030542.17257-1-benl@squareup.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Firmware sends delete_sta_context_ind when it detects the AP has gone away in STA mode. Right now the handler for that indication only handles AP mode; fix it to also handle STA mode. Cc: stable@vger.kernel.org Fixes: 8def9ec46a5f ("wcn36xx: Enable firmware link monitoring") Signed-off-by: Benjamin Li Reviewed-by: Bryan O'Donoghue --- drivers/net/wireless/ath/wcn36xx/smd.c | 44 +++++++++++++++++++------- 1 file changed, 33 insertions(+), 11 deletions(-) -- 2.17.1 diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c index 57fa857b290b..f6bea896abe8 100644 --- a/drivers/net/wireless/ath/wcn36xx/smd.c +++ b/drivers/net/wireless/ath/wcn36xx/smd.c @@ -2623,30 +2623,52 @@ static int wcn36xx_smd_delete_sta_context_ind(struct wcn36xx *wcn, size_t len) { struct wcn36xx_hal_delete_sta_context_ind_msg *rsp = buf; - struct wcn36xx_vif *tmp; + struct wcn36xx_vif *vif_priv; + struct ieee80211_vif *vif; + struct ieee80211_bss_conf *bss_conf; struct ieee80211_sta *sta; + bool found = false; if (len != sizeof(*rsp)) { wcn36xx_warn("Corrupted delete sta indication\n"); return -EIO; } - wcn36xx_dbg(WCN36XX_DBG_HAL, "delete station indication %pM index %d\n", - rsp->addr2, rsp->sta_id); + wcn36xx_dbg(WCN36XX_DBG_HAL, + "delete station indication %pM index %d reason %d\n", + rsp->addr2, rsp->sta_id, rsp->reason_code); - list_for_each_entry(tmp, &wcn->vif_list, list) { + list_for_each_entry(vif_priv, &wcn->vif_list, list) { rcu_read_lock(); - sta = ieee80211_find_sta(wcn36xx_priv_to_vif(tmp), rsp->addr2); - if (sta) - ieee80211_report_low_ack(sta, 0); + vif = wcn36xx_priv_to_vif(vif_priv); + + if (vif->type == NL80211_IFTYPE_STATION) { + /* We could call ieee80211_find_sta too, but checking + * bss_conf is clearer. + */ + bss_conf = &vif->bss_conf; + if (vif_priv->sta_assoc && + !memcmp(bss_conf->bssid, rsp->addr2, ETH_ALEN)) { + found = true; + wcn36xx_dbg(WCN36XX_DBG_HAL, + "connection loss bss_index %d\n", + vif_priv->bss_index); + ieee80211_connection_loss(vif); + } + } else { + sta = ieee80211_find_sta(vif, rsp->addr2); + if (sta) { + found = true; + ieee80211_report_low_ack(sta, 0); + } + } + rcu_read_unlock(); - if (sta) + if (found) return 0; } - wcn36xx_warn("STA with addr %pM and index %d not found\n", - rsp->addr2, - rsp->sta_id); + wcn36xx_warn("BSS or STA with addr %pM not found\n", rsp->addr2); return -ENOENT; }