Commit 1864b22e authored Dec 07, 2022 by Yang Yingliang Committed by Greg Kroah-Hartman Mar 11, 2023

wifi: iwlegacy: common: don't call dev_kfree_skb() under spin_lock_irqsave()



[ Upstream commit 0c1528675d7a9787cb516b64d8f6c0f6f8efcb48 ]

It is not allowed to call consume_skb() from hardware interrupt context
or with interrupts being disabled. So replace dev_kfree_skb() with
dev_consume_skb_irq() under spin_lock_irqsave(). Compile tested only.

Fixes: 4bc85c13 ("Revert "iwlwifi: split the drivers for agn and legacy devices 3945/4965"")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Acked-by: Stanislaw Gruszka <stf_xl@wp.pl>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20221207144013.70210-1-yangyingliang@huawei.com


Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 9004aa39

drivers/net/wireless/intel/iwlegacy/common.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -5182,7 +5182,7 @@ il_mac_reset_tsf(struct ieee80211_hw hw, struct ieee80211_vif vif)
		memset(&il->current_ht_config, 0, sizeof(struct il_ht_config));

		/* new association get rid of ibss beacon skb */
		dev_kfree_skb(il->beacon_skb);
		dev_consume_skb_irq(il->beacon_skb);
		il->beacon_skb = NULL;
		il->timestamp = 0;

		@@ -5301,7 +5301,7 @@ il_beacon_update(struct ieee80211_hw hw, struct ieee80211_vif vif)
		}

		spin_lock_irqsave(&il->lock, flags);
		dev_kfree_skb(il->beacon_skb);
		dev_consume_skb_irq(il->beacon_skb);
		il->beacon_skb = skb;

		timestamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp;