From: Fabian Frederick <fabf@skynet.be>
Date: Thu, 9 Oct 2014 18:36:22 +0000 (+0200)
Subject: mac80211: directly return ieee80211_vif_use_reserved_context()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=408b18abf677841f49d64ceb884e2b196ca1cf05;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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>
---

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,