iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mac80211: Remove unnecessary variable and label

Browse Source 
The variable ret and label just used as return, so we delete it and
use the return statement instead of the goto statement.

Signed-off-by: dingsenjie <dingsenjie@yulong.com>
Link: https://lore.kernel.org/r/20210805064349.202148-1-dingsenjie@163.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
dingsenjie 2021-08-05 14:43:49 +08:00 committed by Johannes Berg
parent 779969e3c8
commit 0323689d30
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/mac80211/ibss.c
View File

@ -489,7 +489,6 @@ int ieee80211_ibss_csa_beacon(struct ieee80211_sub_if_data *sdata,
const struct cfg80211_bss_ies *ies; const struct cfg80211_bss_ies *ies;
u16 capability = WLAN_CAPABILITY_IBSS; u16 capability = WLAN_CAPABILITY_IBSS;
u64 tsf; u64 tsf;
int ret = 0;
sdata_assert_lock(sdata); sdata_assert_lock(sdata);
@ -501,10 +500,8 @@ int ieee80211_ibss_csa_beacon(struct ieee80211_sub_if_data *sdata,
ifibss->ssid_len, IEEE80211_BSS_TYPE_IBSS, ifibss->ssid_len, IEEE80211_BSS_TYPE_IBSS,
IEEE80211_PRIVACY(ifibss->privacy)); IEEE80211_PRIVACY(ifibss->privacy));
if (WARN_ON(!cbss)) { if (WARN_ON(!cbss))
ret = -EINVAL; return -EINVAL;
goto out;
}
rcu_read_lock(); rcu_read_lock();
ies = rcu_dereference(cbss->ies); ies = rcu_dereference(cbss->ies);
@ -520,18 +517,14 @@ int ieee80211_ibss_csa_beacon(struct ieee80211_sub_if_data *sdata,
sdata->vif.bss_conf.basic_rates, sdata->vif.bss_conf.basic_rates,
capability, tsf, &ifibss->chandef, capability, tsf, &ifibss->chandef,
NULL, csa_settings); NULL, csa_settings);
if (!presp) { if (!presp)
ret = -ENOMEM; return -ENOMEM;
goto out;
}
rcu_assign_pointer(ifibss->presp, presp); rcu_assign_pointer(ifibss->presp, presp);
if (old_presp) if (old_presp)
kfree_rcu(old_presp, rcu_head); kfree_rcu(old_presp, rcu_head);
return BSS_CHANGED_BEACON; return BSS_CHANGED_BEACON;
out:
return ret;
} }
int ieee80211_ibss_finish_csa(struct ieee80211_sub_if_data *sdata) int ieee80211_ibss_finish_csa(struct ieee80211_sub_if_data *sdata)