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

Commit 9004aa39 authored by Markus Elfring's avatar Markus Elfring Committed by Greg Kroah-Hartman
Browse files

net/wireless: Delete unnecessary checks before the macro call “dev_kfree_skb” 



[ Upstream commit 868ad21496020ef83d41fdeed3b0a63de2a3caa5 ]

The dev_kfree_skb() function performs also input parameter validation.
Thus the test around the shown calls is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Stable-dep-of: 0c1528675d7a ("wifi: iwlegacy: common: don't call dev_kfree_skb() under spin_lock_irqsave()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent fe4d7280

drivers/net/wireless/ath/ath10k/wmi.c

+1 −3
Original line number Diff line number Diff line
@@ -9462,7 +9462,5 @@ void ath10k_wmi_detach(struct ath10k *ar) 
	}



	cancel_work_sync(&ar->svc_rdy_work);



	if (ar->svc_rdy_skb)

	dev_kfree_skb(ar->svc_rdy_skb);

}

drivers/net/wireless/intel/iwlegacy/3945-mac.c

+2 −6
Original line number Diff line number Diff line
@@ -2302,8 +2302,6 @@ __il3945_down(struct il_priv *il) 
	il3945_hw_txq_ctx_free(il);

exit:

	memset(&il->card_alive, 0, sizeof(struct il_alive_resp));



	if (il->beacon_skb)

	dev_kfree_skb(il->beacon_skb);

	il->beacon_skb = NULL;
@@ -3847,9 +3845,7 @@ il3945_pci_remove(struct pci_dev *pdev) 
	il_free_channel_map(il);

	il_free_geos(il);

	kfree(il->scan_cmd);

	if (il->beacon_skb)

	dev_kfree_skb(il->beacon_skb);



	ieee80211_free_hw(il->hw);

}

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

+2 −6
Original line number Diff line number Diff line
@@ -5182,7 +5182,6 @@ 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 */

	if (il->beacon_skb)

	dev_kfree_skb(il->beacon_skb);

	il->beacon_skb = NULL;

	il->timestamp = 0;
@@ -5302,10 +5301,7 @@ il_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif) 
	}



	spin_lock_irqsave(&il->lock, flags);



	if (il->beacon_skb)

	dev_kfree_skb(il->beacon_skb);



	il->beacon_skb = skb;



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

drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c

+1 −4
Original line number Diff line number Diff line
@@ -77,10 +77,7 @@ int mt76x02_mac_set_beacon(struct mt76x02_dev *dev, u8 vif_idx, 
	for (i = 0; i < ARRAY_SIZE(dev->beacons); i++) {

		if (vif_idx == i) {

			force_update = !!dev->beacons[i] ^ !!skb;



			if (dev->beacons[i])

			dev_kfree_skb(dev->beacons[i]);



			dev->beacons[i] = skb;

			__mt76x02_mac_set_beacon(dev, bcn_idx, skb);

		} else if (force_update && dev->beacons[i]) {

drivers/net/wireless/st/cw1200/scan.c

+1 −2
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ int cw1200_hw_scan(struct ieee80211_hw *hw, 
		++priv->scan.n_ssids;

	}



	if (frame.skb)

	dev_kfree_skb(frame.skb);

	mutex_unlock(&priv->conf_mutex);

	queue_work(priv->workqueue, &priv->scan.work);