openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Markus Elfring 2019-08-22 10:20:10 +02:00 committed by Kalle Valo
parent 52d4261862
commit 868ad21496
5 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/ath/ath10k/wmi.c
View File

@ -9481,7 +9481,5 @@ void ath10k_wmi_detach(struct ath10k *ar)
} }
cancel_work_sync(&ar->svc_rdy_work); cancel_work_sync(&ar->svc_rdy_work);
dev_kfree_skb(ar->svc_rdy_skb);
if (ar->svc_rdy_skb)
dev_kfree_skb(ar->svc_rdy_skb);
} }

8
drivers/net/wireless/intel/iwlegacy/3945-mac.c
View File

@ -2301,9 +2301,7 @@ __il3945_down(struct il_priv *il)
il3945_hw_txq_ctx_free(il); il3945_hw_txq_ctx_free(il);
exit: exit:
memset(&il->card_alive, 0, sizeof(struct il_alive_resp)); memset(&il->card_alive, 0, sizeof(struct il_alive_resp));
dev_kfree_skb(il->beacon_skb);
if (il->beacon_skb)
dev_kfree_skb(il->beacon_skb);
il->beacon_skb = NULL; il->beacon_skb = NULL;
/* clear out any free frames */ /* clear out any free frames */
@ -3846,9 +3844,7 @@ il3945_pci_remove(struct pci_dev *pdev)
il_free_channel_map(il); il_free_channel_map(il);
il_free_geos(il); il_free_geos(il);
kfree(il->scan_cmd); kfree(il->scan_cmd);
if (il->beacon_skb) dev_kfree_skb(il->beacon_skb);
dev_kfree_skb(il->beacon_skb);
ieee80211_free_hw(il->hw); ieee80211_free_hw(il->hw);
} }

8
drivers/net/wireless/intel/iwlegacy/common.c
View File

@ -5182,8 +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)); memset(&il->current_ht_config, 0, sizeof(struct il_ht_config));
/* new association get rid of ibss beacon skb */ /* new association get rid of ibss beacon skb */
if (il->beacon_skb) dev_kfree_skb(il->beacon_skb);
dev_kfree_skb(il->beacon_skb);
il->beacon_skb = NULL; il->beacon_skb = NULL;
il->timestamp = 0; il->timestamp = 0;
@ -5302,10 +5301,7 @@ il_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
} }
spin_lock_irqsave(&il->lock, flags); spin_lock_irqsave(&il->lock, flags);
dev_kfree_skb(il->beacon_skb);
if (il->beacon_skb)
dev_kfree_skb(il->beacon_skb);
il->beacon_skb = skb; il->beacon_skb = skb;
timestamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp; timestamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp;

5
drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c
View File

@ -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++) { for (i = 0; i < ARRAY_SIZE(dev->beacons); i++) {
if (vif_idx == i) { if (vif_idx == i) {
force_update = !!dev->beacons[i] ^ !!skb; force_update = !!dev->beacons[i] ^ !!skb;
dev_kfree_skb(dev->beacons[i]);
if (dev->beacons[i])
dev_kfree_skb(dev->beacons[i]);
dev->beacons[i] = skb; dev->beacons[i] = skb;
__mt76x02_mac_set_beacon(dev, bcn_idx, skb); __mt76x02_mac_set_beacon(dev, bcn_idx, skb);
} else if (force_update && dev->beacons[i]) { } else if (force_update && dev->beacons[i]) {

3
drivers/net/wireless/st/cw1200/scan.c
View File

@ -120,8 +120,7 @@ int cw1200_hw_scan(struct ieee80211_hw *hw,
++priv->scan.n_ssids; ++priv->scan.n_ssids;
} }
if (frame.skb) dev_kfree_skb(frame.skb);
dev_kfree_skb(frame.skb);
mutex_unlock(&priv->conf_mutex); mutex_unlock(&priv->conf_mutex);
queue_work(priv->workqueue, &priv->scan.work); queue_work(priv->workqueue, &priv->scan.work);
return 0; return 0;