From patchwork Mon Nov 11 19:40:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 11237573 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5541114E5 for ; Mon, 11 Nov 2019 19:40:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 33595214E0 for ; Mon, 11 Nov 2019 19:40:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qGvPuxp+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727161AbfKKTky (ORCPT ); Mon, 11 Nov 2019 14:40:54 -0500 Received: from mail-ot1-f65.google.com ([209.85.210.65]:33259 "EHLO mail-ot1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726927AbfKKTky (ORCPT ); Mon, 11 Nov 2019 14:40:54 -0500 Received: by mail-ot1-f65.google.com with SMTP id u13so12256572ote.0; Mon, 11 Nov 2019 11:40:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=shU2J5MGutpyjMyh4O9vSnabrYGZWqe8emFU2lBG2tY=; b=qGvPuxp+AbhEIClSiR7Hk/2ZD+eADq9JG9vzFCFee7SBpgBzff72h57eqt9OGKcIEx l/6zzPgwUUB/lZ2xCyfJM6762rcvLftUQ8NGJ50n8PDus6xtArQsIfD7gOAoUYR5rStR zaIvetf0Gjklj0DmgzwHs6x+kc3QqIeh6YI8ixSVBfxKqgqspYzbcZm1be8/ZX+pu0c8 x45+3XT/vzke9SpN98UI9RUDvSlkOqWJpLVOqFRLZfspIeqQRrMxV0BNwee8bl2/ubBE e8TByg2So1nItdBKxRvGDn3cfEevFXQ1amdwC+3L3v5F4Z+7Av5ljU9rAL2iQmwP0nB+ JMUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=shU2J5MGutpyjMyh4O9vSnabrYGZWqe8emFU2lBG2tY=; b=ZPA0NXV52XlXnwjjiZa0jpRf2iQI8g1Cu1xg/BtGqF6j2n5vuO0R9eaZs4OXRCMhkV YcSTCjMV4vR3jEcAYuDZa44PN9MSUaHkSZ3XeAXvhGCjiNwukJsth1/xP/cT1HIATKxf d5S60+iL8uSbJAIa+EeM/C6Gu1jLSIUxO3JHCnci20jOe81Cydnmflg2qP5jzYBA3Nqe wS99AJk5Vr6kmfFJ4oc9t7JCJX+hMLpBSESizyKC52uEi4zjcnUqx8zN8lekHYbCl/iQ +R91K9A5KfzO3mp3xRxxYH+4Ttqv945VcuKLhMBoSEu9qxZwteZYm2oZD3fYNPEV6QbZ Wb+w== X-Gm-Message-State: APjAAAXMZduXfUMnzoBKTLH+aKlmagaaDS4Ncz8eniIoIp4WrgQJ9dS7 621W9nfRlYIa3fQFAkCF9C8= X-Google-Smtp-Source: APXvYqxE8yv9qhu6ExkLev1Cpqd++Uk8HVcT8as4CAu4sQytl/ajPfiAFw8tFJ08kji8AZUIbYL80w== X-Received: by 2002:a9d:4a9c:: with SMTP id i28mr21730902otf.169.1573501253637; Mon, 11 Nov 2019 11:40:53 -0800 (PST) Received: from localhost.localdomain (cpe-24-31-245-230.kc.res.rr.com. [24.31.245.230]) by smtp.gmail.com with ESMTPSA id o22sm5031002otk.47.2019.11.11.11.40.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2019 11:40:53 -0800 (PST) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, pkshih@realtek.com, Larry Finger , Stable Subject: [PATCH 1/3] rtlwifi: rtl8192de: Fix missing code to retrieve RX buffer address Date: Mon, 11 Nov 2019 13:40:44 -0600 Message-Id: <20191111194046.26908-2-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191111194046.26908-1-Larry.Finger@lwfinger.net> References: <20191111194046.26908-1-Larry.Finger@lwfinger.net> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org In commit 38506ecefab9 ("rtlwifi: rtl_pci: Start modification for new drivers"), a callback to get the RX buffer address was added to the PCI driver. Unfortunately, driver rtl8192de was not modified appropriately and the code runs into a WARN_ONCE() call. The use of an incorrect array is also fixed. Fixes: 38506ecefab9 ("rtlwifi: rtl_pci: Start modification for new drivers") Cc: Stable # 3.18+ Signed-off-by: Larry Finger --- drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c index 2494e1f118f8..b4561923a70a 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c @@ -804,13 +804,15 @@ u64 rtl92de_get_desc(struct ieee80211_hw *hw, break; } } else { - struct rx_desc_92c *pdesc = (struct rx_desc_92c *)p_desc; switch (desc_name) { case HW_DESC_OWN: - ret = GET_RX_DESC_OWN(pdesc); + ret = GET_RX_DESC_OWN(p_desc); break; case HW_DESC_RXPKT_LEN: - ret = GET_RX_DESC_PKT_LEN(pdesc); + ret = GET_RX_DESC_PKT_LEN(p_desc); + break; + case HW_DESC_RXBUFF_ADDR: + ret = GET_RX_DESC_BUFF_ADDR(p_desc); break; default: WARN_ONCE(true, "rtl8192de: ERR rxdesc :%d not processed\n", From patchwork Mon Nov 11 19:40:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 11237575 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D529E13BD for ; Mon, 11 Nov 2019 19:40:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B24C721E6F for ; Mon, 11 Nov 2019 19:40:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cnKNYMpA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727247AbfKKTkz (ORCPT ); Mon, 11 Nov 2019 14:40:55 -0500 Received: from mail-ot1-f66.google.com ([209.85.210.66]:46608 "EHLO mail-ot1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727153AbfKKTkz (ORCPT ); Mon, 11 Nov 2019 14:40:55 -0500 Received: by mail-ot1-f66.google.com with SMTP id n23so12215495otr.13; Mon, 11 Nov 2019 11:40:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ux6PcVKUkqIeV4gk2q6oB+RKeiUnJFZU2ksmKsu1Q3g=; b=cnKNYMpAr0P3zGnuuG3HMJz45DCgQL2Ne5tN4iIBk+SjDS981l2+YFiLnN9tOFLnrI /KBK2ILHWKccs6nftOsWeQ8+LJUMtyL8vpnfAfsxzCIOAmYhAuiPRD7w0YNgfK4V+2nT 4OzPHdyE6SYwQQxBDbgV7FB00mXIGDj4YkxciEL1V0/5UGtKp1j5DvTZMhMlAAcx1UFS ++lgfv9oR0wOZAlqceB6UpGEydp8MLkBYCvIDB3YOO74/p9Gf+OvHNtLF/VU80ScLis6 y9pLWbCTx9RHGRaaucXRl9+vQ9/waliSTf2cqJ6LyoATR0USdPe3ZzoyGgmJJ6dOvMav 8Xxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Ux6PcVKUkqIeV4gk2q6oB+RKeiUnJFZU2ksmKsu1Q3g=; b=DeDF7Ozu76PzqxhJZoj9JRrL68AKyEbXt/7vD6/WP3W9bz1bZsA4yclIizKnRccSZD RaWOG/4Cc10heGu6xlYgs33UI4Z8f3OkPobynSEFlT+UE1YZ9f4hv5KSngUuOf5FvQD3 +i8MWEVrNzJ6gLKsyB8Kgtw5UPwKJkhy7hNKQqzCeiETq6Z7dHrcQoX6rdvzq+Bd7eYO JFZ4qP5E8C1Y3iZvHQmCO4qCy4s694r8enNSiVzIgJnnlYBK/jrBP/q6SZgTZ5D/C782 7O0RGAWus0HypkVhPlD7zWYM3Cu3lbs8OIvY+yxAG8/fpmOP2xa1Lt0Cqys6tP9uJlAY VoBQ== X-Gm-Message-State: APjAAAX6eVEeFXEZR9grWUrYdv4J0BQ0GJICskiG0lVjD2jahIIQDjF3 ufkEXq45w7M1vmTDTbvoWVU= X-Google-Smtp-Source: APXvYqzNotmgNyy1oV8onhlUkI+FpJ5/y3DSW/RWST0qkGtXGMGiV37svWtl2glRY4le9qWQMEA9Sw== X-Received: by 2002:a05:6830:1d71:: with SMTP id l17mr21879643oti.236.1573501254353; Mon, 11 Nov 2019 11:40:54 -0800 (PST) Received: from localhost.localdomain (cpe-24-31-245-230.kc.res.rr.com. [24.31.245.230]) by smtp.gmail.com with ESMTPSA id o22sm5031002otk.47.2019.11.11.11.40.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2019 11:40:54 -0800 (PST) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, pkshih@realtek.com, Larry Finger , Stable Subject: [PATCH 2/3] rtlwifi: rtl8192de: Fix missing callback that tests for hw release of buffer Date: Mon, 11 Nov 2019 13:40:45 -0600 Message-Id: <20191111194046.26908-3-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191111194046.26908-1-Larry.Finger@lwfinger.net> References: <20191111194046.26908-1-Larry.Finger@lwfinger.net> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org In commit 38506ecefab9 ("rtlwifi: rtl_pci: Start modification for new drivers"), a callback needed to check if the hardware has released a buffer indicating that a DMA operation is completed was not added. Fixes: 38506ecefab9 ("rtlwifi: rtl_pci: Start modification for new drivers") Cc: Stable # v3.18+ Signed-off-by: Larry Finger --- .../net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 1 + .../wireless/realtek/rtlwifi/rtl8192de/trx.c | 17 +++++++++++++++++ .../wireless/realtek/rtlwifi/rtl8192de/trx.h | 2 ++ 3 files changed, 20 insertions(+) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c index 99e5cd9a5c86..1dbdddce0823 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c @@ -216,6 +216,7 @@ static struct rtl_hal_ops rtl8192de_hal_ops = { .led_control = rtl92de_led_control, .set_desc = rtl92de_set_desc, .get_desc = rtl92de_get_desc, + .is_tx_desc_closed = rtl92de_is_tx_desc_closed, .tx_polling = rtl92de_tx_polling, .enable_hw_sec = rtl92de_enable_hw_security_config, .set_key = rtl92de_set_key, diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c index b4561923a70a..92c9fb45f800 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c @@ -823,6 +823,23 @@ u64 rtl92de_get_desc(struct ieee80211_hw *hw, return ret; } +bool rtl92de_is_tx_desc_closed(struct ieee80211_hw *hw, + u8 hw_queue, u16 index) +{ + struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); + struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[hw_queue]; + u8 *entry = (u8 *)(&ring->desc[ring->idx]); + u8 own = (u8)rtl92de_get_desc(hw, entry, true, HW_DESC_OWN); + + /* a beacon packet will only use the first + * descriptor by defaut, and the own bit may not + * be cleared by the hardware + */ + if (own) + return false; + return true; +} + void rtl92de_tx_polling(struct ieee80211_hw *hw, u8 hw_queue) { struct rtl_priv *rtlpriv = rtl_priv(hw); diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h index 36820070fd76..635989e15282 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h @@ -715,6 +715,8 @@ void rtl92de_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx, u8 desc_name, u8 *val); u64 rtl92de_get_desc(struct ieee80211_hw *hw, u8 *p_desc, bool istx, u8 desc_name); +bool rtl92de_is_tx_desc_closed(struct ieee80211_hw *hw, + u8 hw_queue, u16 index); void rtl92de_tx_polling(struct ieee80211_hw *hw, u8 hw_queue); void rtl92de_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc, bool b_firstseg, bool b_lastseg, From patchwork Mon Nov 11 19:40:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 11237577 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ACBE713BD for ; Mon, 11 Nov 2019 19:40:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8B41521655 for ; Mon, 11 Nov 2019 19:40:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="M2UHEeIs" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727344AbfKKTk4 (ORCPT ); Mon, 11 Nov 2019 14:40:56 -0500 Received: from mail-ot1-f65.google.com ([209.85.210.65]:43287 "EHLO mail-ot1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727177AbfKKTkz (ORCPT ); Mon, 11 Nov 2019 14:40:55 -0500 Received: by mail-ot1-f65.google.com with SMTP id l14so12231732oti.10; Mon, 11 Nov 2019 11:40:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W0k6JZD8kjz+vTgXniNU5bsoejW224xb6dmKkwGLsAc=; b=M2UHEeIsUHdrR3s1Eno1YdYvWEmkSw9XaVTSiMgai7ulz0GOl5sSmW329BiJsBO+ly 9f3DYL2sk90op5hYGBLOa6Fq5KVhphajTOgPfJDV6XsozFkD+ntZyP/r04QB8gFhnwhQ uqLxfFdNH2gvPCmjlTrAbWnxaJk0/3Z2KhujIFqnJ8G/vGYXB3GGsg2ZGhJigojJMLGG +BH2uxd3VMYdhIQufnPwgrx5DRYn5ELhzjKoIMIIQIyoceGrTQdLfk9so1NTgKPVoPPa PUxWi07EPQxzXTaeVsxxNRraW5Z8z8o9mPyQZ8OOJYfCumYAKUV7Mnq6rSJDF5nVqttK V/vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=W0k6JZD8kjz+vTgXniNU5bsoejW224xb6dmKkwGLsAc=; b=gqWdrvz/xmsgxOU4f9hoiWGQ+52Zm840t3n3Pd7XctIPe1N0vKzLTYwdDyxqozNkFp EJQ6zF7kWTY4kLmR9HAPMHlXDSMupBwwC1hEMVqxsz98ypgSNeTQ/GMqVzGlruU8Jgj2 NwKahjDa6H/tyKmeRZTWBDbHblbf10gEiuigd6AdenwQqllT4jur+0iEm0o7eMPUlyqE yiZZ7J3ZeJ1SX9Jggi5aHWraZuKUaM0WlvIeZggs9C5BTyEm/dTdbCn2RPHzdd1MEfSI jkXekpknhaUa6JLqd8s0i805SJV3h1wOJWk3SiVr/RK6NiYpNjF/Lj/yKpIw1+XCzyYA JiPQ== X-Gm-Message-State: APjAAAW1ySMTvDOH3r0MdRf//VUIu4z588LZz9hdihUjvSfGYdnSjybK 2g9e/dddgk/Bb2XmKaq3YNw= X-Google-Smtp-Source: APXvYqwKj0W9ruYZkc9/m5NUDyFOSx+XNv2LdyHC+Jrsa6RJee4AlcPtwKsluHeKyx8RUWXbTyZYNQ== X-Received: by 2002:a9d:27c6:: with SMTP id c64mr22032900otb.307.1573501255043; Mon, 11 Nov 2019 11:40:55 -0800 (PST) Received: from localhost.localdomain (cpe-24-31-245-230.kc.res.rr.com. [24.31.245.230]) by smtp.gmail.com with ESMTPSA id o22sm5031002otk.47.2019.11.11.11.40.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2019 11:40:54 -0800 (PST) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, pkshih@realtek.com, Larry Finger , Stable Subject: [PATCH 3/3] rtlwifi: rtl8192de: Fix missing enable interrupt flag Date: Mon, 11 Nov 2019 13:40:46 -0600 Message-Id: <20191111194046.26908-4-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191111194046.26908-1-Larry.Finger@lwfinger.net> References: <20191111194046.26908-1-Larry.Finger@lwfinger.net> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org In commit 38506ecefab9 ("rtlwifi: rtl_pci: Start modification for new drivers"), the flag that indicates that interrupts are enabled was never set. In addition, there are several places when enable/disable interrupts were commented out are restored. A sychronize_interrupts() call is removed. Fixes: 38506ecefab9 ("rtlwifi: rtl_pci: Start modification for new drivers") Cc: Stable # v3.18+ Signed-off-by: Larry Finger --- drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c index c7f29a9be50d..146fe144f5f5 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c @@ -1176,6 +1176,7 @@ void rtl92de_enable_interrupt(struct ieee80211_hw *hw) rtl_write_dword(rtlpriv, REG_HIMR, rtlpci->irq_mask[0] & 0xFFFFFFFF); rtl_write_dword(rtlpriv, REG_HIMRE, rtlpci->irq_mask[1] & 0xFFFFFFFF); + rtlpci->irq_enabled = true; } void rtl92de_disable_interrupt(struct ieee80211_hw *hw) @@ -1185,7 +1186,7 @@ void rtl92de_disable_interrupt(struct ieee80211_hw *hw) rtl_write_dword(rtlpriv, REG_HIMR, IMR8190_DISABLED); rtl_write_dword(rtlpriv, REG_HIMRE, IMR8190_DISABLED); - synchronize_irq(rtlpci->pdev->irq); + rtlpci->irq_enabled = false; } static void _rtl92de_poweroff_adapter(struct ieee80211_hw *hw) @@ -1351,7 +1352,7 @@ void rtl92de_set_beacon_related_registers(struct ieee80211_hw *hw) bcn_interval = mac->beacon_interval; atim_window = 2; - /*rtl92de_disable_interrupt(hw); */ + rtl92de_disable_interrupt(hw); rtl_write_word(rtlpriv, REG_ATIMWND, atim_window); rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval); rtl_write_word(rtlpriv, REG_BCNTCFG, 0x660f); @@ -1371,9 +1372,9 @@ void rtl92de_set_beacon_interval(struct ieee80211_hw *hw) RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG, "beacon_interval:%d\n", bcn_interval); - /* rtl92de_disable_interrupt(hw); */ + rtl92de_disable_interrupt(hw); rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval); - /* rtl92de_enable_interrupt(hw); */ + rtl92de_enable_interrupt(hw); } void rtl92de_update_interrupt_mask(struct ieee80211_hw *hw,