summaryrefslogtreecommitdiff
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-10-09 22:36:22 +0400
committerJohannes Berg <johannes.berg@intel.com>2014-10-09 22:54:04 +0400
commit408b18abf677841f49d64ceb884e2b196ca1cf05 (patch)
tree60dfbe7dbc4abfdeee29cdea7cd2ae9fa2f1322b /net/mac80211/cfg.c
parente9ed49bf4c2c2bd4d57667f14d595864d7596ded (diff)
downloadlinux-408b18abf677841f49d64ceb884e2b196ca1cf05.tar.xz
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>
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r--net/mac80211/cfg.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 9d58b30b096a..4bb2d34b2dd7 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -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,