Unverified Commit 35d2ca45 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15353 rtl818x: Prevent using not initialized queues 

Merge Pull Request from: @ci-robot 
 
PR sync from: Luo Gengkun <luogengkun2@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/WLYXGT74WBP7F3IU7ZCN4YKOBM3JDZGE/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBP1BA 
 
Link:https://gitee.com/openeuler/kernel/pulls/15353

 

Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 456b1d09 b98f8b14

drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c

+6 −2
Original line number Diff line number Diff line
@@ -460,8 +460,10 @@ static void rtl8180_tx(struct ieee80211_hw *dev, 
	struct rtl8180_priv *priv = dev->priv;

	struct rtl8180_tx_ring *ring;

	struct rtl8180_tx_desc *entry;

	unsigned int prio = 0;

	unsigned long flags;

	unsigned int idx, prio, hw_prio;

	unsigned int idx, hw_prio;



	dma_addr_t mapping;

	u32 tx_flags;

	u8 rc_flags;
@@ -470,6 +472,8 @@ static void rtl8180_tx(struct ieee80211_hw *dev, 
	/* do arithmetic and then convert to le16 */

	u16 frame_duration = 0;



	/* rtl8180/rtl8185 only has one useable tx queue */

	if (dev->queues > IEEE80211_AC_BK)

		prio = skb_get_queue_mapping(skb);

	ring = &priv->tx_ring[prio];