mac80211: directly return ieee80211_vif_use_reserved_context()
authorFabian Frederick <fabf@skynet.be>
Thu, 9 Oct 2014 18:36:22 +0000 (20:36 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 9 Oct 2014 18:54:04 +0000 (20:54 +0200)
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>
net/mac80211/cfg.c

index 9d58b30..4bb2d34 100644 (file)
@@ -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,