Commit 0323689d authored by dingsenjie's avatar dingsenjie Committed by Johannes Berg
Browse files

mac80211: Remove unnecessary variable and label 



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: default avatardingsenjie <dingsenjie@yulong.com>
Link: https://lore.kernel.org/r/20210805064349.202148-1-dingsenjie@163.com


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 779969e3

net/mac80211/ibss.c

+4 −11
Original line number Diff line number Diff line
@@ -489,7 +489,6 @@ int ieee80211_ibss_csa_beacon(struct ieee80211_sub_if_data *sdata, 
	const struct cfg80211_bss_ies *ies;

	u16 capability = WLAN_CAPABILITY_IBSS;

	u64 tsf;

	int ret = 0;



	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,

				IEEE80211_PRIVACY(ifibss->privacy));



	if (WARN_ON(!cbss)) {

		ret = -EINVAL;

		goto out;

	}

	if (WARN_ON(!cbss))

		return -EINVAL;



	rcu_read_lock();

	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,

					   capability, tsf, &ifibss->chandef,

					   NULL, csa_settings);

	if (!presp) {

		ret = -ENOMEM;

		goto out;

	}

	if (!presp)

		return -ENOMEM;



	rcu_assign_pointer(ifibss->presp, presp);

	if (old_presp)

		kfree_rcu(old_presp, rcu_head);



	return BSS_CHANGED_BEACON;

 out:

	return ret;

}



int ieee80211_ibss_finish_csa(struct ieee80211_sub_if_data *sdata)