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

Commit 0aa25709 authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files

rtlwifi: rtl8192de: Fix missing callback that tests for hw release of buffer 



commit 3155db7613edea8fb943624062baf1e4f9cfbfd6 upstream.

In commit 38506ece ("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: 38506ece ("rtlwifi: rtl_pci: Start modification for new drivers")
Cc: Stable <stable@vger.kernel.org>	# v3.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 56a35a3f

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

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,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,

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

+17 −0
Original line number Diff line number Diff line
@@ -859,6 +859,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);

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

+2 −0
Original line number Diff line number Diff line
@@ -737,6 +737,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,