Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56a35a3f authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files

rtlwifi: rtl8192de: Fix missing code to retrieve RX buffer address 



commit 0e531cc575c4e9e3dd52ad287b49d3c2dc74c810 upstream.

In commit 38506ece ("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: 38506ece ("rtlwifi: rtl_pci: Start modification for new drivers")
Cc: Stable <stable@vger.kernel.org> # 3.18+
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8862b80b

drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c

+5 −3
Original line number Diff line number Diff line
@@ -840,13 +840,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",