diff mbox series

wifi: rtw88: sdio: Fix disconnection after beacon loss

Message ID 20250106135434.35936-1-fiona.klute@gmx.de (mailing list archive)
State New
Delegated to: Ping-Ke Shih
Headers show
Series wifi: rtw88: sdio: Fix disconnection after beacon loss | expand

Commit Message

Fiona Klute Jan. 6, 2025, 1:54 p.m. UTC
This is the equivalent of 28818b4d871bc93cc4f5c7c7d7c526a6a096c09c
"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 <fiona.klute@gmx.de>
---
 drivers/net/wireless/realtek/rtw88/sdio.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Vasily Khoruzhick Jan. 6, 2025, 6:01 p.m. UTC | #1
On Mon, Jan 6, 2025 at 5:54 AM Fiona Klute <fiona.klute@gmx.de> wrote:
>
> This is the equivalent of 28818b4d871bc93cc4f5c7c7d7c526a6a096c09c
> "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 <fiona.klute@gmx.de>

Tested-by: Vasily Khoruzhick <anarsoul@gmail.com> # Tested on Pinebook

> ---
>  drivers/net/wireless/realtek/rtw88/sdio.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/net/wireless/realtek/rtw88/sdio.c b/drivers/net/wireless/realtek/rtw88/sdio.c
> index 799230eb5f1..e024061bdbf 100644
> --- a/drivers/net/wireless/realtek/rtw88/sdio.c
> +++ b/drivers/net/wireless/realtek/rtw88/sdio.c
> @@ -1192,6 +1192,8 @@ static void rtw_sdio_indicate_tx_status(struct rtw_dev *rtwdev,
>         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);
> --
> 2.47.1
>
Ping-Ke Shih Jan. 7, 2025, 12:27 a.m. UTC | #2
Fiona Klute <fiona.klute@gmx.de> wrote:
> This is the equivalent of 28818b4d871bc93cc4f5c7c7d7c526a6a096c09c

Normally use 12 digits as pattern like: 

Commit 28818b4d871b ("wifi: rtw88: usb: Fix disconnection after beacon loss")

I can spin this during merging. 

> "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 <fiona.klute@gmx.de>

Acked-by: Ping-Ke Shih <pkshih@realtek.com>

> ---
>  drivers/net/wireless/realtek/rtw88/sdio.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/net/wireless/realtek/rtw88/sdio.c b/drivers/net/wireless/realtek/rtw88/sdio.c
> index 799230eb5f1..e024061bdbf 100644
> --- a/drivers/net/wireless/realtek/rtw88/sdio.c
> +++ b/drivers/net/wireless/realtek/rtw88/sdio.c
> @@ -1192,6 +1192,8 @@ static void rtw_sdio_indicate_tx_status(struct rtw_dev *rtwdev,
>         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);
> --
> 2.47.1
diff mbox series

Patch

diff --git a/drivers/net/wireless/realtek/rtw88/sdio.c b/drivers/net/wireless/realtek/rtw88/sdio.c
index 799230eb5f1..e024061bdbf 100644
--- a/drivers/net/wireless/realtek/rtw88/sdio.c
+++ b/drivers/net/wireless/realtek/rtw88/sdio.c
@@ -1192,6 +1192,8 @@  static void rtw_sdio_indicate_tx_status(struct rtw_dev *rtwdev,
 	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);