From patchwork Mon Aug 30 17:09:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Poulain X-Patchwork-Id: 504337 Delivered-To: patch@linaro.org Received: by 2002:a02:8629:0:0:0:0:0 with SMTP id e38csp1966595jai; Mon, 30 Aug 2021 09:58:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzNRCvkO1HsnUFsqTyHR+izST+HwDblRiYZ6exrKSOrTj43B7bztNOM0QshrGmTYYquh6hY X-Received: by 2002:a17:906:6bc5:: with SMTP id t5mr26504180ejs.340.1630342705707; Mon, 30 Aug 2021 09:58:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630342705; cv=none; d=google.com; s=arc-20160816; b=Occr97d6xFoMw1Sa4IjJJLPyFG0x6imEOqc4GXsZZuqXKBxyIzohpP0kP4xxjywRUv 6RtVLKMyGNNgvZ6HBCgsctDBy02oHx923K57eRNdQROnoGv3tGPl/umn47Tn+i9F+Dx8 GndYxpNiWakxcOI5ewqK0SlDRbhgjMcXv0dY05tmNkokxK4zRLJF9Gtui7CB3N2hpWkp Yx0RuCxql4WBwpu5dwyPejuMKjrcbjq5tqXgoGUOvljdMYIOP4wwi2gDta4LTIzsvDyD dknK4NpYnWjMWCABT1N5sSt5So/Ud5ChwH3WshgMSzlwLagyWw4s4hKoU+csZpyrD7fP NdQQ== 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=bv45KdT4Zm8l8jEqKG5eCu37McR/6YB/mBE0UhGjXlI=; b=Eb4Kkzhy6mGxW/4eoUUN4Kya3pE5bEnAkh99lmiVTZegPdJcG/iYeqBcbgIAwaxLC7 uwIIPwI/4zLMeTUiBLh2mgxw2Xx3CVp+/sv3i/N0bOrKpClLvBPc2rVgcGLkwP94Nyh+ KEtMrzt5ghiRCxHZxVCrPjXbzRJ8PApmTQTOCoU1TgFkClyW5QJcNvXGhjfWJSrNCs+O RvzEY4tm472xRnDbOyDXehMKqI8q+jwq8EmvSz7ZTZn7uv8JE8Fl9glm4Zz7O6cgvZTL AFk+d5s826zXh/SMyBGnVIE2SpLlBLLiLS3XTgocy3aM4uz77aWe7Fvz8PtityJOXFxP PAFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Fpm8KZ30; 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=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z13si5404247edb.22.2021.08.30.09.58.25; Mon, 30 Aug 2021 09:58:25 -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=@linaro.org header.s=google header.b=Fpm8KZ30; 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=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237988AbhH3Q7R (ORCPT + 11 others); Mon, 30 Aug 2021 12:59:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237987AbhH3Q7R (ORCPT ); Mon, 30 Aug 2021 12:59:17 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 140DAC061575 for ; Mon, 30 Aug 2021 09:58:23 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id f9-20020a05600c1549b029025b0f5d8c6cso15203310wmg.4 for ; Mon, 30 Aug 2021 09:58:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=bv45KdT4Zm8l8jEqKG5eCu37McR/6YB/mBE0UhGjXlI=; b=Fpm8KZ30UhfR+FyeLGEv+OjD5Sa3ifrD2lU0n/5R+sGkMZlCv+VEYVmA7M6ApLw/SY cKnr6j4SkD3rJEmh6qA5XVbzevsPclsPm1X1nAor1w/Am0huQlkmzGBLudAjsdb/78He byXG9uDUJaGhivyVzjc+GXsEhZd11FE724sbKeHgdCrDMjuVbvA/S7aCXlcxBgI1JlUb bup3LgrEzVUKZoCLdjhT6XZsdLZZ/hEEizFnI73Ee+fODeEr5c+4wkInjqb40X+lY45q ap6gJPLEzBNGzqhy7wowkmbHehJOfu1DqzIXJfAim6a7hcnUG8nWknyMjaZtDVS/k+HY y0kA== 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=bv45KdT4Zm8l8jEqKG5eCu37McR/6YB/mBE0UhGjXlI=; b=Wm1DmDaNgwbaUf8GJGOtwy6iTOP9otpeQspFfRiKDig0GhbvLMKhVksHfd+h0oU6PF hEq767+GL/I5YbMAhoiJOPC9Ur8hDPLsIV/iBu2Kg5g4JgB2fuf2VzydvnXgY7r9CBU4 vG6svu7f3f0hGEiHGQAFUs8yECvNpXQ7vG1bEoeQOpY9Fok/hqwcRW9MQ1E/m6QbsxbU bx3hBDRCJacRqEtNIx2YhNmqXOFnpJld1PPEns9PffQQofXr2hYGWkNNNWOKleD1zTI9 qMGyV2ZLc+Xtg8TQc8JkN8liw6CIjRWRaAQNqfS0nHkrc2qaa2SGwAKrpc30ZtLxfJiD 3UFw== X-Gm-Message-State: AOAM5315tVaAsW8e17JfJtHk2pbiar1IjNXY9kfvdE2opiW5F/49JyCr SR9bkHBoKo2hMHNTTHcp+Kw9Gg== X-Received: by 2002:a1c:23d2:: with SMTP id j201mr22822039wmj.163.1630342701525; Mon, 30 Aug 2021 09:58:21 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:82c:5f0:8009:4e09:ca3:8f6]) by smtp.gmail.com with ESMTPSA id r129sm72256wmr.7.2021.08.30.09.58.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Aug 2021 09:58:21 -0700 (PDT) From: Loic Poulain To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, bryan.odonoghue@linaro.org, Loic Poulain , stable@vger.kernel.org Subject: [PATCH] Revert "wcn36xx: Enable firmware link monitoring" Date: Mon, 30 Aug 2021 19:09:20 +0200 Message-Id: <1630343360-5942-1-git-send-email-loic.poulain@linaro.org> X-Mailer: git-send-email 2.7.4 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This reverts commit 8def9ec46a5fafc0abcf34489a9e8a787bca984d. The firmware keep-alive does not cause any event in case of error such as non acked. It's just a basic keep alive to prevent the AP to kick-off the station due to inactivity. So let mac80211 submit its own monitoring packet (probe/null) and disconnect on timeout. Note: We want to keep firmware keep alive to prevent kick-off when host is in suspend-to-mem (no mac80211 monitor packet). Ideally fw keep alive should be enabled in suspend path and disabled in resume path to prevent having both firmware and mac80211 submitting periodic null packets. This fixes non detected AP leaving issues in active mode (nothing monitors beacon or connection). Cc: stable@vger.kernel.org Fixes: 8def9ec46a5f ("wcn36xx: Enable firmware link monitoring") Signed-off-by: Loic Poulain --- drivers/net/wireless/ath/wcn36xx/main.c | 1 - 1 file changed, 1 deletion(-) -- 2.7.4 Acked-by: Bryan O'Donoghue Acked-by: Bryan O'Donoghue diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c index 216bc34..128d25d 100644 --- a/drivers/net/wireless/ath/wcn36xx/main.c +++ b/drivers/net/wireless/ath/wcn36xx/main.c @@ -1362,7 +1362,6 @@ static int wcn36xx_init_ieee80211(struct wcn36xx *wcn) ieee80211_hw_set(wcn->hw, HAS_RATE_CONTROL); ieee80211_hw_set(wcn->hw, SINGLE_SCAN_ON_ALL_BANDS); ieee80211_hw_set(wcn->hw, REPORTS_TX_ACK_STATUS); - ieee80211_hw_set(wcn->hw, CONNECTION_MONITOR); wcn->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_AP) |