From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEF1FC43603 for ; Wed, 4 Dec 2019 18:00:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B49B52084B for ; Wed, 4 Dec 2019 18:00:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482443; bh=Yj7DTE05YmiiUVnQBhSV+4QMhfmiyyEt8PJod1Z5pI0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DcrXCZ6jNhN4IZHtKBDZiMTzalxbqyj7Mz+Bqn6J/gI7JI56BkjA3YDKgfTlOAK1A Ia3r/mlG/AaWEJErwNgUKAyI40/iCgbeZWPx6ENK5yRiJMgXyBYYe+9Lgu1en4o6Ry 3SEACaA7DA5K9WW1KTnFSj9ek9CxxNdYU5BuVWkU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729413AbfLDSAm (ORCPT ); Wed, 4 Dec 2019 13:00:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:39582 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729401AbfLDSAi (ORCPT ); Wed, 4 Dec 2019 13:00:38 -0500 Received: from localhost (unknown [217.68.49.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9EE0E2084B; Wed, 4 Dec 2019 18:00:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482438; bh=Yj7DTE05YmiiUVnQBhSV+4QMhfmiyyEt8PJod1Z5pI0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pFUbuiCTGN8MA5GdxWK6myCYETJF1+1Rq2lNhww8qLFOesnsGwt1l2f8sx1Ia4fRb semoz3KD9ItmwuMm84gHzEHsBOr4w8/vI3pFSrE2mO9+hT5n5WEZUIwhWBLxv02YbG WopYG7d2/B7bgJizVHqNkpcXB4/gV4EI4q0QQE6A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kyle Roeschley , Kalle Valo , Sasha Levin Subject: [PATCH 4.4 47/92] ath6kl: Fix off by one error in scan completion Date: Wed, 4 Dec 2019 18:49:47 +0100 Message-Id: <20191204174333.315465682@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204174327.215426506@linuxfoundation.org> References: <20191204174327.215426506@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Kyle Roeschley [ Upstream commit 5803c12816c43bd09e5f4247dd9313c2d9a2c41b ] When ath6kl was reworked to share code between regular and scheduled scans in commit 3b8ffc6a22ba ("ath6kl: Configure probed SSID list consistently"), probed SSID entry changed from 1-index to 0-indexed. However, ath6kl_cfg80211_scan_complete_event() was missed in that change. Fix its indexing so that we correctly clear out the probed SSID list. Signed-off-by: Kyle Roeschley Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index 2b79815f59093..7653fa47508bb 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c @@ -1083,7 +1083,7 @@ void ath6kl_cfg80211_scan_complete_event(struct ath6kl_vif *vif, bool aborted) if (vif->scan_req->n_ssids && vif->scan_req->ssids[0].ssid_len) { for (i = 0; i < vif->scan_req->n_ssids; i++) { ath6kl_wmi_probedssid_cmd(ar->wmi, vif->fw_vif_idx, - i + 1, DISABLE_SSID_FLAG, + i, DISABLE_SSID_FLAG, 0, NULL); } } -- 2.20.1