From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B9299281369; Thu, 13 Feb 2025 14:42:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739457755; cv=none; b=vGGbWfh8vQypLeHd61tse2KUtU17B8IdomTWa2Mp6h0AKnACATIglMihEkCc7D+Wm8c/Gzb+OH/G1O0M/voGhx14KKE8814+azWwZih2vWIwB2JS1R3+xlopNLkhW5k5jmNdKsSajMZPx/qxnl7vN15uMCMBri8Z/USU8YgNkXU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739457755; c=relaxed/simple; bh=1yhjZxzfiyjrY25eaf2WQFRFRlVxl7Egg7rFkuVZwVk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CH9VqPLHOBe7CzXCDgYTo4yNTkq26x5zVAyqSJxHyOg9EZG5KB4Azx1G97nQ2W6R5reFJwWgBlIrqITwpxeVbpS/+eaBd0of/hEXzgDS0NItZayllCIKAJGNPwrJepJG2s+XOgd81d8Xc39yAMynqAOyYsuyL8NmXy7vQDm4mVA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=sXpLpt/S; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="sXpLpt/S" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26F2CC4CED1; Thu, 13 Feb 2025 14:42:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739457755; bh=1yhjZxzfiyjrY25eaf2WQFRFRlVxl7Egg7rFkuVZwVk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sXpLpt/SiCC09mdq9IsujnAGLi4O8WLS0qVnedZ8MiQYBXboi8uiBRa9v5j5t4qfv 6Bd+ktDGOnlhM3dsFCiahOZxtH+Uu0MpY2EcRvbnqydiz9wfY7tW12Cl8qObNzD/zc hhvaSVedN05ajkarf36+WnLG5sny/mboX3Agv5h0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Fiona Klute , Ping-Ke Shih , Vasily Khoruzhick Subject: [PATCH 6.12 205/422] wifi: rtw88: sdio: Fix disconnection after beacon loss Date: Thu, 13 Feb 2025 15:25:54 +0100 Message-ID: <20250213142444.452284567@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250213142436.408121546@linuxfoundation.org> References: <20250213142436.408121546@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Fiona Klute commit fb2fcfbe5eef9ae26b0425978435ae1308951e51 upstream. This is the equivalent of commit 28818b4d871b ("wifi: rtw88: usb: Fix disconnection after beacon loss") for SDIO chips. Tested on Pinephone (RTL8723CS), random disconnections became rare, instead of a frequent nuisance. Cc: stable@vger.kernel.org Signed-off-by: Fiona Klute Tested-by: Vasily Khoruzhick # Tested on Pinebook Acked-by: Ping-Ke Shih Signed-off-by: Ping-Ke Shih Link: https://patch.msgid.link/20250106135434.35936-1-fiona.klute@gmx.de Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/realtek/rtw88/sdio.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/net/wireless/realtek/rtw88/sdio.c +++ b/drivers/net/wireless/realtek/rtw88/sdio.c @@ -1193,6 +1193,8 @@ static void rtw_sdio_indicate_tx_status( struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_hw *hw = rtwdev->hw; + skb_pull(skb, rtwdev->chip->tx_pkt_desc_sz); + /* enqueue to wait for tx report */ if (info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS) { rtw_tx_report_enqueue(rtwdev, skb, tx_data->sn);