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

Commit 7fe3b3ab authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: rtl8188ee: rtl8821ae: Fix a queue locking problem 



The code fails to lock the skb queue, which leads to a number of problems.
This patch also fixes a Sparse warning about using a memset of 1 byte.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: troy_tan@realsil.com.cn
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a0196d11

drivers/net/wireless/rtlwifi/rtl8188ee/fw.c

+1 −1
Original line number Diff line number Diff line
@@ -770,7 +770,7 @@ void rtl88e_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state) 
	switch (p2p_ps_state) {

	case P2P_PS_DISABLE:

		RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_DISABLE\n");

		memset(p2p_ps_offload, 0, 1);

		memset(p2p_ps_offload, 0, sizeof(*p2p_ps_offload));

		break;

	case P2P_PS_ENABLE:

		RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_ENABLE\n");

drivers/net/wireless/rtlwifi/rtl8188ee/hw.c

+3 −0
Original line number Diff line number Diff line
@@ -89,7 +89,9 @@ static void _rtl88ee_return_beacon_queue_skb(struct ieee80211_hw *hw) 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));

	struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[BEACON_QUEUE];

	unsigned long flags;



	spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);

	while (skb_queue_len(&ring->queue)) {

		struct rtl_tx_desc *entry = &ring->desc[ring->idx];

		struct sk_buff *skb = __skb_dequeue(&ring->queue);
@@ -101,6 +103,7 @@ static void _rtl88ee_return_beacon_queue_skb(struct ieee80211_hw *hw) 
		kfree_skb(skb);

		ring->idx = (ring->idx + 1) % ring->entries;

	}

	spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);

}



static void _rtl88ee_disable_bcn_sub_func(struct ieee80211_hw *hw)

drivers/net/wireless/rtlwifi/rtl8821ae/fw.c

+1 −1
Original line number Diff line number Diff line
@@ -1757,7 +1757,7 @@ void rtl8821ae_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state) 
	switch (p2p_ps_state) {

	case P2P_PS_DISABLE:

		RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_DISABLE\n");

		memset(p2p_ps_offload, 0, 1);

		memset(p2p_ps_offload, 0, sizeof(*p2p_ps_offload));

		break;

	case P2P_PS_ENABLE:

		RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_ENABLE\n");