| Message ID | 20191111194046.26908-2-Larry.Finger@lwfinger.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0e531cc575c4e9e3dd52ad287b49d3c2dc74c810 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | rtlwifi: rtl8192de: Fixes for several regressions | expand |
Larry Finger <Larry.Finger@lwfinger.net> wrote: > 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 <stable@vger.kernel.org> # 3.18+ > Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> 3 patches applied to wireless-drivers-next.git, thanks. 0e531cc575c4 rtlwifi: rtl8192de: Fix missing code to retrieve RX buffer address 3155db7613ed rtlwifi: rtl8192de: Fix missing callback that tests for hw release of buffer 330bb7117101 rtlwifi: rtl8192de: Fix missing enable interrupt flag
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",
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 <stable@vger.kernel.org> # 3.18+ Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> --- drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)