Commit 408b18ab authored Oct 09, 2014 by Fabian Frederick Committed by Johannes Berg Oct 09, 2014

mac80211: directly return ieee80211_vif_use_reserved_context()



No need to store ieee80211_vif_use_reserved_context()
result and test it before returning.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent e9ed49bf

net/mac80211/cfg.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -2901,11 +2901,7 @@ static int __ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata)
		if (sdata->reserved_ready)
		return 0;

		err = ieee80211_vif_use_reserved_context(sdata);
		if (err)
		return err;

		return 0;
		return ieee80211_vif_use_reserved_context(sdata);
		}

		if (!cfg80211_chandef_identical(&sdata->vif.bss_conf.chandef,